He Zhenxing b443bbb47a Auto merge		2008-11-28 17:52:53 +08:00
..
binlog	BUG#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01:00
bugs	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00
federated	Post-merge fixes to fix test cases.	2008-10-29 18:38:18 +01:00
funcs_1	Remove files which were created during an upmerge	2008-11-06 18:51:00 +01:00
funcs_2	Upmerge 5.0 -> 5.1	2008-07-09 20:55:23 +02:00
im	Move instance manager tests to it's own suite	2007-08-29 19:02:33 +02:00
jp	Bug#36597 Testsuite "jp": Suspicious results for some tests using sjis	2008-07-29 10:43:57 +05:00
large_tests
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
ndb_team	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
parts	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
rpl	Auto merge	2008-11-28 17:52:53 +08:00
rpl_ndb	BUG#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Final fix for bug#36522 in 5.1. This new fix was necessary due to fix of bug 37708.	2008-07-23 16:06:44 +02:00