diff options
author | knielsen@mysql.com <> | 2006-02-24 13:51:04 +0100 |
---|---|---|
committer | knielsen@mysql.com <> | 2006-02-24 13:51:04 +0100 |
commit | 436587e9970be9516fee357b93535b31477dee79 (patch) | |
tree | 89cbf41afa68b215ad7b30cff684a9a10e3f53b1 | |
parent | b11c033f496eccc680c1026a57af836c9a4578f3 (diff) | |
download | mariadb-git-436587e9970be9516fee357b93535b31477dee79.tar.gz |
Fix mysqldump.test to work with non-standard --vardir.
(Backported from mysql-5.1-new)
-rw-r--r-- | mysql-test/t/mysqldump.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 6c981ae7577..9008eff6642 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1050,14 +1050,14 @@ create algorithm=merge view v4 as select * from t1 with cascaded check option; create algorithm =temptable view v5 as select * from t1; # dump tables and views ---exec $MYSQL_DUMP test > var/tmp/bug14871.sql +--exec $MYSQL_DUMP test > $MYSQLTEST_VARDIR/tmp/bug14871.sql # drop the db, tables and views drop table t1; drop view v1, v2, v3, v4, v5; # Reload dump ---exec $MYSQL test < var/tmp/bug14871.sql +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug14871.sql # check that all tables and views could be created show tables; @@ -1083,13 +1083,13 @@ end| delimiter ;| # dump table and trigger ---exec $MYSQL_DUMP test > var/tmp/bug16878.sql +--exec $MYSQL_DUMP test > $MYSQLTEST_VARDIR/tmp/bug16878.sql drop trigger tr1; drop trigger tr2; drop table t1, t2; # reload dump ---exec $MYSQL test < var/tmp/bug16878.sql +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug16878.sql --replace_column 6 # show triggers; drop trigger tr1; |