mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
163970 commits 2781 branches 343 tags 1.6 GiB
Commit graph

163970 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
dfb001edcd percona-server-5.6.22-72.0 2015-02-18 13:19:09 +01:00
Jan Lindström
865b83e9a4 Fixed test failure seen on partition_innodb_plugin test case. 2015-02-18 14:07:13 +02:00
Jan Lindström
2fb81b956d MDEV-7408: Cannot use a table containing special chars for InnoDB stopwords 
Added test case. No actual bug found.
 2015-02-18 11:25:59 +02:00
Jan Lindström
63905f1447 Add forgotten test case change (add more). 2015-02-18 07:28:44 +02:00
Jan Lindström
a1a32f8f25 Revert file space allocation change on row0merge.cc. 2015-02-18 06:59:28 +02:00
Sergei Golubchik
44cf4d6751 fix a case where automatic procedure grant was changing user's password 
phase out make_password_from_salt() to be removed in 10.1
 2015-02-17 18:07:56 +01:00
Sergei Petrunia
22dae70015 Added testcase for MDEV-7193: Incorrect Query Result (MySQL Bug 68897) ... 2015-02-17 20:07:12 +03:00
Kentoku SHIBA
f5dabd7aca Update Mroonga to the latest version on 2015-02-17T13:34:27+0900 2015-02-17 13:34:27 +09:00
Sergei Golubchik
fdd6c111c2 MDEV-7419 Function cli_safe_read not exported 
Start the client API for low-level protocol access:
* unsigned long mysql_net_read_packet(MYSQL *mysql);
* unsigned long mysql_net_field_length(unsigned char **packet);
 2015-02-13 12:57:11 +01:00
Jan Lindström
454beee5fb MDEV-6288 :Innodb causes server crash after disk full, then can't ALTER TABLE any more 
Fix try to avoid unnecessary crashes when disk full situation is reached
on alter table.
 2015-02-13 11:49:31 +02:00
Olivier Bertrand
2201aa66cf - Typo on the jsonudf.cpp name 
modified:
  storage/connect/CMakeLists.txt
 2015-02-12 17:23:28 +01:00
Vicențiu Ciorbaru
356ae629f0 Crash during configure without development SSL libraries installed 
Incorrect usage of OPENSSL_INCLUDE_DIR variable within cmake caused the
configure step to fail. The variable was used before being checked if
the include directory actually existed.
 2015-02-12 15:44:44 +02:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
ed839052d7 Merge tag 'tokudb-7.5.5' into bb-5.5-merge 2015-02-12 00:23:21 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Olivier Bertrand
dcfe068d59 - Adding json udf's. Making the second version of json tables. 
added:
  storage/connect/jsonudf.cpp
modified:
  storage/connect/CMakeLists.txt
  storage/connect/json.cpp
  storage/connect/json.h
  storage/connect/tabjson.cpp
  storage/connect/tabjson.h

- Fix utf8 issues with PROXY tables
modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
 2015-02-11 21:39:41 +01:00
Sergei Golubchik
2a1be9cdf8 XtraDB 5.5.41-37.0 2015-02-11 20:40:56 +01:00
Sergei Golubchik
13927f878e percona-server-5.5.41-37.0 2015-02-11 18:32:40 +01:00
Sergei Golubchik
d996dc2997 MDEV-7290 please update MSI installer to include HeidiSQL 9.1 2015-02-11 15:02:15 +01:00
Jan Lindström
56da6252f7 Improve InnoDB transaction lock output by providing number of table locks 
this transaction is currently holding and total number of table locks to
the table where lock is held.
 2015-02-10 15:15:27 +02:00
Alexander Barkov
a2578018bf Fixing compilation failure in storage/connect when -DMYSQL_MAINTAINER_MODE=ON: 
disabling some CXX errors in storage/connect/CMakeLists.txt.
 2015-02-10 16:01:03 +04:00
Sergei Golubchik
63108dc9d2 Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
Sergei Golubchik
75884242ab restore a cross-compiling bit that was lost in a merge 2015-02-10 10:19:42 +01:00
Jan Lindström
48e7c19f9e Fix test failure innodb-mdev7046 on Windows. Test causes 
OS error printout from InnoDB.
 2015-02-10 09:41:54 +02:00
Sergei Golubchik
a34fd50ce1 MDEV-7478 log-basename unpredictable behavior in standalone mode 
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
 2015-02-09 20:53:36 +01:00
Sergei Golubchik
f007f82881 MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot 
include oqgraph into deb packages conditionally, just like we do with tokudb
 2015-02-09 20:53:28 +01:00
unknown
c233d6e120 MDEV-7260: Crash in get_best_combination when executing multi-table UPDATE with nested views 
Do not use merge_for_insert for commands which use SELECT because optimizer can't work with such tables.

Fixes which makes multi-delete working with normally merged views.
 2015-02-11 01:26:50 +01:00
Alexey Botchkov
cfb7d5d78a MDEV-7516 Assertion `!cur_p->event' failed in Gcalc_scan_iterator::arrange_event(int, int). 
When the distance in ST_BUFFER is too far negative the coordinates can run out of the operational
    area. We should just return an empty geometry in this case.
 2015-02-10 16:16:31 +04:00
Jan Lindström
552f1b3505 Fix test failures on innodb-mdev-7055 and innodb-mdev-7513. 2015-02-10 14:17:23 +02:00
Jan Lindström
ada07435b4 Fix test failure on innodb-mdev-7055. 2015-02-10 08:08:59 +02:00
Jan Lindström
44a9e3f7b4 MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8 
The testcase fails randomly due to ibuf merge happening in the background.
Fix not to do any merges with ibuf_debug enabled.
 2015-02-09 16:14:27 +02:00
Olivier Bertrand
3c097fd689 - Remove some GCC warnings 
modified:
  storage/connect/ha_connect.cc
 2015-02-08 19:47:26 +01:00
Alexey Botchkov
919f40e464 Audit plugin v1.2.0. 2015-02-08 22:38:19 +04:00
Olivier Bertrand
96ba1f1473 - Handle the use of date/time values when making queries for MYSQL or 
ODBC. Was raised by 7549.
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
 2015-02-08 18:17:29 +01:00
Elena Stepanova
0d73bc1c25 MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists) 
Previously IF NOT EXISTS was added in Debian version in revno 3543. 
Now added the same for Ubuntu.
 2015-02-08 15:47:00 +03:00
Olivier Bertrand
35548d577c - Modify the connect_type_conv and connect_conv_size variables. 
They were global (read-only) now they are session (not read-only)
modified:
  storage/connect/checklvl.h
  storage/connect/ha_connect.cc
  storage/connect/myconn.cpp
  storage/connect/myutil.cpp
  storage/connect/tabutil.cpp

- Suppress the compver variable on Linux compile. Was not
  debian reproductible because using __DATE__ and __TIME__ macros.
modified:
  storage/connect/ha_connect.cc

- ODBC LONGVARVAR type conversion now uses connect_conv_size.
modified:
  storage/connect/odbconn.cpp
 2015-02-07 11:33:52 +01:00
Alexey Botchkov
b9d616c243 MDEV-7435 Windows debug: Run-Time Check Failure #3 - The variable 'unused' is being used without being initialized. 
Fixed as it's done in 10.0.
 2015-02-06 15:49:45 +04:00
Igor Babaev
ffd2996e10 Merge 2015-02-05 21:46:04 -08:00
Igor Babaev
587c72088c Fixed bug mdev-7316. 
The function table_cond_selectivity() should take into account that condition selectivity
for some fields can be set to 0.
 2015-02-05 20:09:08 -08:00
Jan Lindström
5c6eb5222e Fix test failure. 2015-02-04 16:50:29 +02:00
Jan Lindström
8cc9751165 MDEV-7538: Wrong constraint (TINYINT or MEDIUMINT and INT) 
causes server crash

Analysis: If wrong data types used on foreign constraint there
was possibility that foreign->id is NULL when incorrect
foreign constraint was removed from the dictionary cache.

Fix: Add guard foreign->id != NULL before trying to lookup
or remove the foreign constraint from dictionary cache.

Tested using user database where problem was repeatable.
 2015-02-04 14:40:46 +02:00
Jan Lindström
422ffe99b5 InnoDB and XtraDB produce different output on MDEV-7513. 2015-02-04 11:12:46 +02:00
Jan Lindström
f32091532d MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845 
Debug assertion maybe too strict.
 2015-02-04 10:50:16 +02:00
Jan Lindström
7afbf338aa MDEV-7513: ib_warn_row_too_big dereferences null thd 
Analysis: Purge thread does not have thd and no access to
handlerton.

Fix: If thd does not exists we use sql_print_warning instead
of push_warning_printf.
 2015-02-04 09:29:54 +02:00
Olivier Bertrand
22367ba71f - Add or correct some tracing code 
modified:
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
 2015-02-02 19:34:35 +01:00
Olivier Bertrand
82f2be67ae - Fix a bug causing Insert into ODBC to fail when the column name is 
UTF8 encoded.
modified:
  storage/connect/tabodbc.cpp
 2015-02-02 15:35:58 +01:00
Olivier Bertrand
6a78371991 - Fix a bug causing UseCnc not being initialized for ODBC catalog tables. 
This made errors by calling SQLConnect or SQLDriverConnect randomly
  with incorrect parameters.
modified:
  storage/connect/tabodbc.cpp
  
- Removing GCC warnings  
modified:
  storage/connect/ha_connect.cc

- Typo
modified:
  storage/connect/odbconn.cpp
 2015-02-01 12:16:30 +01:00
Olivier Bertrand
180b2be63c - Add the possibility to establish an ODBC connection via SQLConnect (the 
default being still to use SQLDriverConnect)
modified:
  storage/connect/ha_connect.cc
  storage/connect/odbccat.h
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

- Cardinality testing not possible for TBL tables
modified:
  storage/connect/tabtbl.cpp

- Make all line ending LF instead of CRLF
modified:
  storage/connect/tabjson.cpp
 2015-01-31 15:05:43 +01:00
Sergei Golubchik
a06624d61f merge 2015-01-30 21:24:39 +01:00