Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
706a7a8f · msvensson@pilot.blaudden · 266cd861 · 398c24d1 · 706a7a8f
Commit 706a7a8f authored Mar 31, 2007 by msvensson@pilot.blaudden
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlbinlog.test +1 -1

No files found.
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -205,7 +205,7 @@ select hex(a) from t1;
 drop table t1;
 flush logs;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000010
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000010

 --echo End of 5.0 tests