summaryrefslogtreecommitdiff
path: root/mysql-test/extra
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+710
|\
| * BUG#46864 Incorrect update of InnoDB table on slave when using trigger with m...Alfranio Correia2009-08-271-32/+15
| * BUG#28976 Mixing trans and non-trans tables in one transaction results in inc...Alfranio Correia2009-08-271-0/+727
* | Applied the fix for bug #46931 from mysql-5.1 main trunkIgor Babaev2009-09-181-1/+11
* | Merge MySQL->MariaDBSergey Petrunya2009-09-084-98/+228
|\ \ | |/
| * Bug #45214 get_master_version_and_clock does not report error when queries failunknown2009-07-161-0/+63
| * Fix for bug#45998: database crashes when runningRamil Kalimullin2009-07-141-0/+12
| * BUG#44270: Post-push fixLuis Soares2009-06-261-2/+2
| * BUG#44270: RESET SLAVE does not reset Last_IO_Error or Last_IO_ErrnoLuis Soares2009-06-031-0/+54
| * Bug#37716.Serge Kozlov2009-04-041-98/+99
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-0/+76
|\ \ | |/
| * Manual merge.Ramil Kalimullin2009-03-251-0/+40
| * BUG#39701: Mixed binlog format does not switch to row mode onLuis Soares2009-03-241-0/+36
* | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-254-56/+52
|\ \
| * \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-114-56/+52
| |\ \ | | |/
| | * Merging with 5.1-bugteam.Mats Kindahl2009-02-0916-69/+249
| | |\
| | | * Bug #39265: fix for the bug 33699 should be revertedGleb Shchepa2009-02-051-1/+1
| | * | Bug #36763Mats Kindahl2009-02-063-50/+51
* | | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-1/+1
|/ / /
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-1219-68/+272
|\ \ \ | | |/ | |/|
| * | Post-merge patch for extra/rpl_test/rpl_log.test: Serge Kozlov2009-02-021-0/+3
| * | merge: 5.1 -> 5.1-rplLuis Soares2009-01-232-0/+19
| |\ \ | | |/
| | * Auto mergeHe Zhenxing2009-01-141-0/+2
| | |\
| | | * Bug#41888: Test binlog.binlog_database causing binlog_innodb to fail on Pushb...Patrick Crews2009-01-121-0/+2
| | * | BUG#41986 Replication slave does not pick up proper AUTO_INCREMENT value for ...He Zhenxing2009-01-141-0/+17
| | |/
| * | BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuildSven Sandberg2009-01-091-0/+168
| * | Bug#41108: It is a testcase timeout bug so the patch fixes test code in places Serge Kozlov2008-12-121-7/+12
| * | BUG#38350: Many tests don't clean up after themselves on exit.Sven Sandberg2008-11-133-7/+14
| * | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-122-2/+181
| |\ \ | | |/
| * | Post-merge fixes to fix test cases.Mats Kindahl2008-10-291-2/+5
| * | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-235-19/+73
| |\ \
| * | | Post-merge fixes.Mats Kindahl2008-10-071-6/+2
| * | | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-063-10/+40
| |\ \ \
| * \ \ \ Merging with 5.1-rpl.Mats Kindahl2008-08-202-40/+80
| |\ \ \ \
| | * \ \ \ Merge 5.1-rpl-testfixes -> 5.1-rplHe Zhenxing2008-08-142-40/+80
| | |\ \ \ \
| * | | | | | Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary ...Mats Kindahl2008-08-201-0/+15
| |/ / / / /
| * | | | | MergeMagnus Svensson2008-08-081-1/+148
| |\ \ \ \ \
| | * \ \ \ \ merged 5.1 main to 5.1-rplSven Sandberg2008-08-0412-48/+51
| | |\ \ \ \ \
| * | | | | | | Bug #32307 mysqltest - does not detect illegal if syntaxMagnus Svensson2008-08-041-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | BUG#37975: wait_for_slave_* should increase the timeoutSven Sandberg2008-07-103-21/+14
| * | | | | | Merge 5.1 -> 5.1-rplSven Sandberg2008-07-061-0/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 5.1->5.1-rplMagnus Svensson2008-05-301-51/+63
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-04-032-4/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-03-2510-27/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #34654 RESET SLAVE and STOP SLAVE/START SLAVE does not clear Last_XYZ_E...unknown2008-03-141-6/+6
| | * | | | | | | | | Update pathsunknown2008-03-031-3/+4
| | * | | | | | | | | Fix after mergeunknown2008-02-281-2/+0
| | * | | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-289-18/+29
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update path to the load_fileunknown2007-12-201-1/+6
| | | * | | | | | | | | Use absolute path to allow tets to be run also when datadir differsunknown2007-12-191-3/+5