summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Made the optimizer switch for index condition pushdown set to 'on' by default. Igor Babaev2011-11-211-1/+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
* | | Automerge with 5.2Michael Widenius2010-11-051-22/+68
|\ \ \ | |/ /
| * | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-22/+68
* | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-0/+79
|\ \ \ | |/ /
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+79
| |\ \ | | |/
| | * Bug#51494 crash with join, explain and 'sounds like' operatorSergey Glukhov2010-03-191-0/+12
| | * BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does'tSergey Vojtovich2010-03-031-0/+67
* | | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-1/+1
|/ /
* | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-0/+12
|\ \
| * \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+12
| |\ \ | | |/
| | * Fix for bug #46614: Assertion in show_create_trigger() Ramil Kalimullin2009-08-141-0/+12
* | | Speed up of test suite:Michael Widenius2009-10-281-50/+0
|/ /
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+92
|\ \ | |/
| * 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
* | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+75
|\ \ | |/
| * 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 of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-0/+11
|\ \ | |/
| * 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
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-6/+15
|\ \ \ | |/ /
| * | Bug#35068 Assertion fails when reading from i_s.tables and there is incorrect...Sergey Glukhov2008-10-091-6/+15
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+16
|\ \ \ | |/ /
| * | 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-2/+24
|\ \ \ | |/ /
| * | 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 a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-0/+2
| |\ \ \
| | * | | * tests which use MERGE or INSERT DELAYED should run onlyunknown2007-08-091-0/+2
* | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-0/+37
|\ \ \ \ \
View Lorry Controller Status