unknown d52a1a144b Merge host.loc:/home/uchum/work/5.1-opt-33699 ... into host.loc:/home/uchum/work/5.1-opt mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Auto merged sql/sql_update.cc: Auto merged mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Merge with local tree (bug#33699). mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Merge with local tree (bug#33699).		2008-01-11 21:39:45 +04:00
..
binlog	after-merge fix:	2007-11-29 22:32:34 +04:00
funcs_1	post merge fix for bug#32496.	2007-11-26 22:50:12 +01:00
funcs_2	Merge four.local.lan:/WORK2/merge/mysql-5.0-31556	2007-10-18 13:13:21 +02:00
im	Move instance manager tests to it's own suite	2007-08-29 19:02:33 +02:00
jp	Many files:	2005-01-07 14:32:05 +02:00
large_tests	Bug#27029 alter table ... enable keys crashes mysqld on large table	2007-06-21 12:45:56 -04:00
manual	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	Merge host.loc:/home/uchum/work/5.1-opt-33699	2008-01-11 21:39:45 +04:00
ndb_team	move randomly failing tests to ndb_team suite	2007-12-11 19:57:26 +01:00
parts	additional after merge fix	2007-12-13 21:34:05 +04:00
rpl	Merge host.loc:/home/uchum/work/5.1-opt-33699	2008-01-11 21:39:45 +04:00
rpl_ndb	Enabled test rpl_ndb_ddl	2007-12-11 11:51:14 +01:00
stress	Additional tests checking for symptoms observed within	2007-07-13 18:32:22 +02:00