summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
Commit message (Expand)AuthorAgeFilesLines
* Create 'main' test directory and move 't' and 'r' thereMichael Widenius2018-03-291-3914/+0
* Added Max_index_length and Temporary to SHOW TABLE STATUSMonty2018-02-121-4/+3
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-2/+2
|\
| * Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-2/+2
| |\
| | * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-2/+2
| | |\
| | | * Fix for MDEV-14141 Crash in print_keydup_error()Monty2018-01-241-2/+2
* | | | MDEV-12874 UPDATE statements with the same source and targethalfspawn2017-10-031-28/+0
* | | | MDEV-12137 DELETE statement with the same source and targetSergei Golubchik2017-07-071-42/+0
* | | | MDEV-12137 DELETE statement with the same source and targethalfspawn2017-07-071-14/+28
* | | | Improved warning "xxx is not BASE TABLE/SEQUENCE"Monty2017-06-021-8/+8
|/ / /
* | | MDEV-7635: Update tests to adapt to the new default sql_modeNirbhay Choubey2017-02-101-1/+1
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-0/+17
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-0/+17
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2016-09-271-0/+17
| | |\
| | | * MDEV-10424 - Assertion `ticket == __null' failed in MDL_request::set_typeSergey Vojtovich2016-08-171-0/+17
* | | | Remove end . from error messages to get them consistentMonty2016-10-051-8/+8
* | | | MDEV-6112 multiple triggers per tableMonty2016-10-051-2/+2
* | | | MDEV-6720 - enable connection log in mysqltest by defaultSergey Vojtovich2016-03-311-6/+33
|/ / /
* | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s...Oleksandr Byelkin2015-09-041-5/+8
|/ /
* | Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-311-36/+36
* | 10.0-base mergeSergei Golubchik2013-12-161-0/+7
|\ \
| * \ 5.5 mergeSergei Golubchik2013-12-151-0/+7
| |\ \ | | |/
| | * 5.3 mergeSergei Golubchik2013-12-131-0/+7
| | |\
| | | * 5.2 mergeSergei Golubchik2013-12-021-0/+7
| | | |\
| | | | * MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br...Sergei Golubchik2013-11-291-0/+7
* | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from triggerSergey Vojtovich2013-10-141-0/+2
* | | | | MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege modelSergey Vojtovich2013-09-201-0/+87
* | | | | more post-merge fixes:Sergei Golubchik2013-07-211-12/+12
|/ / / /
* | | | error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-2/+2
* | | | discovery using sql CREATE TABLE statementSergei Golubchik2013-04-091-12/+12
|/ / /
* | | 5.3 mergeSergei Golubchik2013-03-271-25/+156
|\ \ \ | |/ /
| * | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrgSergey Petrunya2013-03-211-0/+130
| * | Merge with 5.2.Michael Widenius2011-12-111-0/+29
| |\ \ | | |/
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-0/+29
| | |\
| | | * BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-0/+29
* | | | 5.3->5.5 mergeSergei Golubchik2011-11-271-1/+1
|\ \ \ \ | |/ / /
| * | | Made the optimizer switch for index condition pushdown set to 'on' by default. Igor Babaev2011-11-211-1/+1
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-6/+40
|\ \ \ \
| * | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-6/+40
* | | | | merge with 5.3Sergei Golubchik2011-10-191-13/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Set the default to be mrr=off,mrr_sort_keys=off:Sergey Petrunya2011-07-081-1/+1
| * | | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-021-1/+1
| * | | | Merge with 5.2Michael Widenius2011-03-091-0/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#35333, "If Federated table can't connect to remote host, can't retrieveChristopher Powers2010-11-291-0/+2
| * | | | Merge with 5.1-release.Michael Widenius2010-12-061-0/+41
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+41
| | |\ \ \ | | | |/ /
| | | * | Bug#46339 - crash on REPAIR TABLE merge table USE_FRMIngo Struewing2010-04-261-0/+41
* | | | | 5.5-mergeSergei Golubchik2011-07-021-2/+102
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#35333, "If Federated table can't connect to remote host, can't retrieveChristopher Powers2010-11-301-0/+2