summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-0/+45
|\
| * BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-0/+45
* | 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
* | 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
|\ \ | |/
| * Bug#51494 crash with join, explain and 'sounds like' operatorSergey Glukhov2010-03-191-0/+15
| * BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does'tSergey Vojtovich2010-03-031-0/+57
* | 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
| |\ \ | | |/
| | * Fix for bug #46614: Assertion in show_create_trigger() Ramil Kalimullin2009-08-141-0/+11
* | | Speed up of test suite:Michael Widenius2009-10-281-0/+4
|/ /
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+108
|\ \ | |/
| * 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
* | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-2/+81
|\ \ | |/
| * Bug#41305 server crashes when inserting duplicate row into a merge tableAnurag Shekhar2009-03-041-0/+18
| * Merge 5.1-bugteam -> 5.1-bugteam (local).Sergey Vojtovich2009-02-121-2/+50
| |\
| | * Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-121-2/+50
| * | BUG#39185 - Cardinality for merge tables calculated incorrectly.Sergey Vojtovich2009-02-051-0/+13
| |/
* | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-0/+14
|\ \ | |/
| * Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-0/+13
| |\
| | * BUG#32047 - 'Spurious' errors while opening MERGE tablesSergey Vojtovich2009-02-041-0/+13
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-6/+19
|\ \ \ | |/ /
| * | Bug#35068 Assertion fails when reading from i_s.tables and there is incorrect...Sergey Glukhov2008-10-091-6/+19
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-3/+20
|\ \ \ | |/ /
| * | Bug#31210: INSERT DELAYED crashes server when used on partitioned tablesMattias Jonsson2008-06-031-3/+3
| * | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-261-0/+16
* | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-0/+13
|\ \ \ | |/ /
| * | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-141-0/+13
| |\ \ | | |/
| | * BUG#28248 - mysqldump results with MERGE ... UNION=() cannot be executedunknown2008-03-141-0/+13
| | * Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-12-131-0/+22
| | |\
| | | * Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131unknown2007-11-261-0/+22
| | | |\
* | | | \ 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
* | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-0/+22
|\ \ \ \ \
| * \ \ \ \ Merge polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131unknown2007-11-261-0/+22
| |\ \ \ \ \
| | * \ \ \ \ Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131unknown2007-11-261-0/+22
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Fix for bug #28837: MyISAM storage engine error (134) doing delete withunknown2007-11-261-0/+22
* | | | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2007-12-121-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Dummy push to help pushbuild running again.unknown2007-12-121-1/+1
| | |_|_|/ | |/| | |
* | | | | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-181-2/+0
* | | | | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-151-6/+841
| |/ / / |/| | |
* | | | Merge stella.local:/home2/mydev/mysql-5.0-bug15522unknown2007-10-091-0/+14
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Bug#15522 - create ... select and with merge tablesunknown2007-10-091-0/+14
| |/
* | Merge chilla.local:/home/mydev/mysql-5.1-amainunknown2007-06-161-0/+21
|\ \
| * \ Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginesunknown2007-06-071-0/+21
| |\ \ | | |/
| | * BUG#26976 - Missing table in merge not noted in related error msg +unknown2007-06-061-0/+21