mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Fix mysqldump.test to work with non-standard --vardir.
(Backported from mysql-5.1-new)
This commit is contained in:
parent
b11c033f49
commit
436587e997
1 changed files with 4 additions and 4 deletions
|
@ -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;
|
create algorithm =temptable view v5 as select * from t1;
|
||||||
|
|
||||||
# dump tables and views
|
# 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 the db, tables and views
|
||||||
drop table t1;
|
drop table t1;
|
||||||
drop view v1, v2, v3, v4, v5;
|
drop view v1, v2, v3, v4, v5;
|
||||||
|
|
||||||
# Reload dump
|
# 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
|
# check that all tables and views could be created
|
||||||
show tables;
|
show tables;
|
||||||
|
@ -1083,13 +1083,13 @@ end|
|
||||||
delimiter ;|
|
delimiter ;|
|
||||||
|
|
||||||
# dump table and trigger
|
# 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 tr1;
|
||||||
drop trigger tr2;
|
drop trigger tr2;
|
||||||
drop table t1, t2;
|
drop table t1, t2;
|
||||||
|
|
||||||
# reload dump
|
# reload dump
|
||||||
--exec $MYSQL test < var/tmp/bug16878.sql
|
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug16878.sql
|
||||||
--replace_column 6 #
|
--replace_column 6 #
|
||||||
show triggers;
|
show triggers;
|
||||||
drop trigger tr1;
|
drop trigger tr1;
|
||||||
|
|
Loading…
Reference in a new issue