summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
Commit message (Expand)AuthorAgeFilesLines
* Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-061-1/+14
* Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() forJon Olav Hauglid2010-09-221-1/+87
* Fix for merge.test failures in mysql-5.5-runtimeDmitry Lenev2010-09-161-28/+0
* Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGEDmitry Lenev2010-09-151-0/+28
* Bug #56292 Deadlock with ALTER TABLE and MERGE tablesJon Olav Hauglid2010-09-081-2/+1
* WL#5370 Keep forward-compatibility when changing unknown2010-08-181-1/+2
* A fix and a test case for Bug#36171 "CREATE TEMPORARY TABLE and Konstantin Osipov2010-07-021-5/+733
* merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-301-3/+30
|\
| * Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111Alexander Nozdrin2010-06-251-3/+30
* | A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()".Konstantin Osipov2010-06-291-0/+102
|/
* This patch backports test coverage for:Jon Olav Hauglid2010-06-111-0/+19
* Backport ofAlexander Nozdrin2010-05-311-1/+6
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-43/+403
|\
| * Bug #51240 ALTER TABLE of a locked MERGE table failsJon Olav Hauglid2010-02-261-0/+10
| * Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-201-5/+5
| * A fix and a test case for Bug#47648 "main.merge fails sporadically".Konstantin Osipov2010-02-151-6/+58
| * Backport of:Konstantin Osipov2009-12-111-10/+19
| * Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-9/+21
| * Backport of revno: 2617.68.36unknown2009-12-091-0/+30
| * Backport of:Konstantin Osipov2009-12-031-19/+266
* | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-0/+12
|\ \
| * | Bug#51494 crash with join, explain and 'sounds like' operatorSergey Glukhov2010-03-191-0/+12
* | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-0/+67
|\ \ \ | |/ / | | / | |/ |/|
| * BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does'tSergey Vojtovich2010-03-031-0/+67
* | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-1/+1
|\ \
| * | Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"Sergey Glukhov2009-10-231-1/+1
* | | Backport of:Konstantin Osipov2009-10-131-0/+36
|/ /
* | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+1
|/
* Fix for bug #46614: Assertion in show_create_trigger() Ramil Kalimullin2009-08-141-0/+12
* Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-0/+46
* Bug#45781 infinite hang/crash in "opening tables" after handler tries to open...Kristofer Pettersson2009-07-161-0/+20
* Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-101-0/+14
* Bug#44040 MySQL allows creating a MERGE table upon VIEWs but crashes when Anurag Shekhar2009-04-171-0/+12
* Bug#41305 server crashes when inserting duplicate row into a merge tableAnurag Shekhar2009-03-041-0/+12
* Merge 5.1-bugteam -> 5.1-bugteam (local).Sergey Vojtovich2009-02-121-1/+44
|\
| * Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-121-1/+44
* | BUG#39185 - Cardinality for merge tables calculated incorrectly.Sergey Vojtovich2009-02-051-0/+19
|/
* Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-0/+11
|\
| * BUG#32047 - 'Spurious' errors while opening MERGE tablesSergey Vojtovich2009-02-041-0/+11
* | Bug#35068 Assertion fails when reading from i_s.tables and there is incorrect...Sergey Glukhov2008-10-091-6/+15
* | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-261-0/+16
* | Post-merge fixesunknown2008-03-141-5/+5
* | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-141-0/+22
|\ \ | |/
| * BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executedunknown2008-03-141-0/+22
| * Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131unknown2007-11-261-0/+37
| |\
* | \ Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-0/+37
|\ \ \
| * \ \ Merge polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131unknown2007-11-261-0/+37
| |\ \ \
| | * \ \ Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131unknown2007-11-261-0/+37
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix for bug #28837: MyISAM storage engine error (134) doing delete withunknown2007-11-261-0/+37
* | | | | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-181-4/+0