From 87468d064be80736fc3d11e7d44f39b254d9d4c5 Mon Sep 17 00:00:00 2001 From: "tsmith@quadxeon.mysql.com" <> Date: Wed, 7 Mar 2007 10:15:45 +0100 Subject: [PATCH] Post-merge fix of mysqlbinlog.{test,result} --- mysql-test/r/mysqlbinlog.result | 3 ++- mysql-test/t/mysqlbinlog.test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 6265f927231..5a7dcca2420 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -313,5 +313,6 @@ DELIMITER ; # End of log file ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; -flush logs; End of 5.0 tests +flush logs; +End of 5.1 tests diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 245aca528dc..9a27c4cbdb2 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -214,7 +214,7 @@ flush logs; # flush logs; --error 1 ---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null +--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null --exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null --echo End of 5.1 tests