summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base merge.Sergei Golubchik2013-09-211-1/+9
|\
| * MDEV-4911 - add KILL query id, and add query id information to processlistSergey Vojtovich2013-09-161-0/+4
| * MDEV-26: Global transaction ID.unknown2013-08-231-1/+3
| * MDEV-4820: Empty master does not give error for slave GTID position that does...unknown2013-08-161-0/+2
* | 10.0-monty mergeSergei Golubchik2013-07-211-469/+742
|\ \
| * | clearly mark unused error messages as suchSergei Golubchik2013-07-101-35/+11
| * | Fix test errors like:Sergey Petrunya2013-07-081-23/+4
| * | Fix limit_rows_examined.test:Sergey Petrunya2013-07-051-0/+2
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-462/+759
* | | 10.0-base mergeSergei Golubchik2013-07-1826-145/+149
|\ \ \ | | |/ | |/|
| * | 5.5 mergeSergei Golubchik2013-07-1726-145/+145
| |\ \
| | * \ mysql-5.5.32 mergeSergei Golubchik2013-07-1625-25/+25
| | |\ \
| | | * | Bug#16779374: NEW ERROR MESSAGE ADDED TO 5.5 AFTER 5.6 GA - REUSINGJon Olav Hauglid2013-05-081-2/+0
| | | * | Bug #13004581 BLACKHOLE BINARY LOG WITH ROW IGNORES UPDATE AND DELETE STATEM...Bill Qu2013-04-271-0/+2
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1925-25/+25
| | * | | MDEV-4515 Long user names are truncated to 48 symbols in error messagesSergei Golubchik2013-06-131-119/+119
| | * | | MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic pluginsSergei Golubchik2013-06-131-1/+1
| * | | | MDEV-4591:Setting gtid* values from inside a transaction might cause unexpect...unknown2013-06-071-0/+4
* | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-26: Global transaction ID.unknown2013-06-051-0/+2
| * | | | MDEV-4605: Failing to load GTID slave position from rpl.gtid_slave_posunknown2013-06-031-1/+1
* | | | | Merge 10.0-base -> 10.0unknown2013-05-281-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-4478: Implement GTID "strict mode"unknown2013-05-281-0/+4
| * | | | MDEV-26: Global transaction ID.unknown2013-05-221-2/+2
| * | | | MDEV-26: Global transaction ID.unknown2013-05-151-0/+2
* | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-171-1/+19
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-151-1/+19
| |\ \ \ \
| | * | | | MDEV-26: Global transaction ID.unknown2013-04-051-3/+3
| | * | | | MDEV-26: Global transaction ID.unknown2013-03-271-0/+2
| | * | | | MDEV-26: Global transaction ID.unknown2013-03-181-0/+6
| | * | | | MDEV-26: Global Transaction ID.unknown2013-03-111-0/+3
| | * | | | MDEV-26: Global transaction ID.unknown2013-02-261-0/+2
| | * | | | MDEV-26: Global Transaction ID.unknown2013-02-151-0/+2
| | * | | | MDEV-26: Global Transaction ID.unknown2013-02-151-1/+5
* | | | | | 10.0-base mergeSergei Golubchik2013-04-151-194/+119
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-180/+102
| * | | | post-review comments and other minor editsSergei Golubchik2013-04-091-3/+3
| * | | | cleanupSergei Golubchik2013-04-091-3/+3
| * | | | discovery using sql CREATE TABLE statementSergei Golubchik2013-04-091-0/+3
| * | | | * don't use 1-8 numbers for open_table_error codes, use an enum.Sergei Golubchik2013-04-091-1/+1
| * | | | 5.5 mergeSergei Golubchik2013-03-271-7/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | MDEV-4156 Test cases query_cache and query_cache_size_basic fail on 32 bit pp...Sergei Golubchik2013-02-081-7/+7
| * | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-162-3/+3
| |\ \ \ | | |/ /
* | | | merge with 5.5Sergei Golubchik2012-11-032-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | mysql-5.5.28Sergei Golubchik2012-10-162-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSIONMartin Hansson2012-08-241-2/+2
| | * | Merging from 5.1Alexander Barkov2012-07-241-1/+1
| | |\ \
| | | * | Fixing wrong copyright. Index.xml was modified in 2005,Alexander Barkov2012-07-241-1/+1
* | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-22/+37
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-4/+6
| |\ \ \ \