unknown 27e1a36df9 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl ... into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Auto merged mysql-test/suite/binlog/r/binlog_row_binlog.result: Auto merged mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Auto merged mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged mysql-test/include/have_multi_ndb.inc: Manual merge. mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result: Manual merge. mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test: Manual merge.		2008-01-11 14:20:06 +01:00
..
binlog	Post-merge fixes to make tests pass.	2008-01-11 13:25:26 +01:00
bugs	BUG#31582 (5.1-telco-6.1 -> 5.1.22. Slave crashes when reading UPDATE for VARCHAR):	2007-12-05 20:49:50 +01: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 dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl	2007-12-19 18:51:46 +01: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 dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl	2008-01-11 14:20:06 +01:00
rpl_ndb	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl	2008-01-11 14:20:06 +01:00
stress	Additional tests checking for symptoms observed within	2007-07-13 18:32:22 +02:00