unknown e0b6803864 Merge polly.local:/tmp/maint/bug25137/my51-bug25137 ... into polly.local:/home/kaa/src/maint/mysql-5.1-maint mysql-test/include/mix2.inc: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/mysqld.cc: Auto merged mysql-test/r/mysqlbinlog.result: Manual merge mysql-test/t/innodb.test: Manual merge mysql-test/t/mysql.test: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge		2007-02-20 23:16:18 +03:00
..
binlog_tests	Merge polly.local:/tmp/maint/bug25137/my51-bug25137	2007-02-20 23:16:18 +03:00
rpl_tests	Use "diff_files" instead ot "exec diff"	2007-02-20 18:47:47 +01:00