diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-31 17:18:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-31 17:18:26 +0200 |
| commit | ee10d9e72d6497c81b21210576d7d3e82ac87f98 (patch) | |
| tree | fb641f1f139c019835d56c1b3ad699fd39a5b7ec /mysql-test/t | |
| parent | bea9525a38b7e2ab6968e4d76d5c88dc10bc8431 (diff) | |
| parent | 407389bae4a88eb35359d275bf1c890f0ea84cad (diff) | |
| download | mariadb-git-ee10d9e72d6497c81b21210576d7d3e82ac87f98.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -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 ef314bced71..630e56ccfd1 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -204,7 +204,7 @@ load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8 select hex(a) from t1; drop table t1; flush logs; ---replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000010 --echo End of 5.0 tests |