diff options
author | msvensson@pilot.blaudden <> | 2007-03-31 15:14:13 +0200 |
---|---|---|
committer | msvensson@pilot.blaudden <> | 2007-03-31 15:14:13 +0200 |
commit | 706a7a8fb5852067a396dd044be242c4920c90f3 (patch) | |
tree | 22d35c4605e659ab8b11623f1444f2bfe85a310b /mysql-test | |
parent | 266cd861e773982107c0894bf3752bf2e68f3586 (diff) | |
parent | 398c24d1a165d805229b361994abe1a4c04b7cfb (diff) | |
download | mariadb-git-706a7a8fb5852067a396dd044be242c4920c90f3.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/mysqlbinlog.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 9a27c4cbdb2..ef314bced71 100644 --- 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 |