summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2007-12-19 17:26:43 +0100
committerunknown <msvensson@pilot.mysql.com>2007-12-19 17:26:43 +0100
commitb981448e5db469387e996bd6fe30c709f8b74804 (patch)
tree9ffba9adfcac3526f80b1457b3ac60ae7485ebd0
parent584888abf777762f7f9cdf29f86796f85b2199e7 (diff)
downloadmariadb-git-b981448e5db469387e996bd6fe30c709f8b74804.tar.gz
Update location of binlog
-rw-r--r--mysql-test/t/mysqlbinlog_base64.test7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test
index 9425fd3301d..71def6a733a 100644
--- a/mysql-test/t/mysqlbinlog_base64.test
+++ b/mysql-test/t/mysqlbinlog_base64.test
@@ -15,8 +15,9 @@ load data infile '../../std_data/words.dat' into table t2;
#
# Save binlog
#
+let $MYSQLD_DATADIR=`select @@datadir`;
flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
#
# Clear database and restore from binlog
@@ -51,7 +52,7 @@ insert into t2 select * from t2;
select count(*) from t2;
flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
#
@@ -62,6 +63,6 @@ select count(*) from t2;
#
# Test cleanup
#
---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
drop table t1;
drop table t2;