summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
* | merge.Sergei Golubchik2010-11-251-73/+69
|\ \ | |/ |/|
| * 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
| | |\
| * | | 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
| | |\ \
| * | | | Speed up of test suite:Michael Widenius2009-10-281-50/+0
| |/ / /
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-0/+92
| |\ \ \
| * \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+75
| |\ \ \ \
| * \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-2/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | 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
View Lorry Controller Status