summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+26
|\
| * Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-1/+26
* | merge with 5.3Sergei Golubchik2011-10-191-15/+0
|\ \
| * \ Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+78
| |\ \
| | * | Bug#46339 - crash on REPAIR TABLE merge table USE_FRMIngo Struewing2010-04-261-0/+78
* | | | 5.5-mergeSergei Golubchik2011-07-021-1/+138
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-061-1/+23
| * | | Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() forJon Olav Hauglid2010-09-221-0/+108
| * | | Fix for merge.test failures in mysql-5.5-runtimeDmitry Lenev2010-09-161-48/+0
| * | | Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGEDmitry Lenev2010-09-151-0/+56
| * | | Bug #56292 Deadlock with ALTER TABLE and MERGE tablesJon Olav Hauglid2010-09-081-2/+1
* | | | merge.Sergei Golubchik2010-11-251-13/+39
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-12/+33
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+72
| |\ \ | | |/
| * | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-0/+11
| |\ \
| | * \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+11
| | |\ \
| * | | | Speed up of test suite:Michael Widenius2009-10-281-0/+4
| |/ / /
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+108
| |\ \ \
| * \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-2/+81
| |\ \ \ \
| * \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-6/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-0/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-2/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | * tests which use MERGE or INSERT DELAYED should run onlyunknown2007-08-091-0/+11
* | | | | | | | | | | WL#5370 Keep forward-compatibility when changing unknown2010-08-181-1/+1
* | | | | | | | | | | A fix and a test case for Bug#36171 "CREATE TEMPORARY TABLE and Konstantin Osipov2010-07-021-5/+330
* | | | | | | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-301-10/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111Alexander Nozdrin2010-06-251-10/+34
* | | | | | | | | | | | A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()".Konstantin Osipov2010-06-291-0/+119
|/ / / / / / / / / / /
* | | | | | | | | | | This patch backports test coverage for:Jon Olav Hauglid2010-06-111-0/+15
* | | | | | | | | | | Backport ofAlexander Nozdrin2010-05-311-1/+8
* | | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-24/+440
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bug #51240 ALTER TABLE of a locked MERGE table failsJon Olav Hauglid2010-02-261-0/+19
| * | | | | | | | | | | A fix and a test case for Bug#47648 "main.merge fails sporadically".Konstantin Osipov2010-02-151-2/+55
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-111-4/+12
| * | | | | | | | | | | Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-4/+9
| * | | | | | | | | | | Backport of revno: 2617.68.36unknown2009-12-091-1/+38
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-16/+310
* | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Bug#51494 crash with join, explain and 'sounds like' operatorSergey Glukhov2010-03-191-0/+15
* | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does'tSergey Vojtovich2010-03-031-0/+57
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Backport of:Konstantin Osipov2009-10-131-0/+60
|/ / / / / / / / /
* | | | | | | | | Fix for bug #46614: Assertion in show_create_trigger() Ramil Kalimullin2009-08-141-0/+11
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-0/+43
* | | | | | | | Bug#45781 infinite hang/crash in "opening tables" after handler tries to open...Kristofer Pettersson2009-07-161-0/+24
* | | | | | | | Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-101-0/+20
* | | | | | | | Bug#44040 MySQL allows creating a MERGE table upon VIEWs but crashes when Anurag Shekhar2009-04-171-0/+21
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Bug#41305 server crashes when inserting duplicate row into a merge tableAnurag Shekhar2009-03-041-0/+18
View Lorry Controller Status