diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 88ec05bc788..05f795f4e68 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3952,12 +3952,12 @@ CREATE VIEW mysqldump_test_db.v2 AS SELECT 1 AS CREATE VIEW mysqldump_test_db.v1 AS SELECT колонка1 FROM mysqldump_test_db.v2; set names latin1; -# Dump mysqldump_test_db to /dev/shm/t1/var/tmp/bug30027.sql. +# Dump mysqldump_test_db to bug30027.sql. # Drop mysqldump_test_db. DROP DATABASE mysqldump_test_db; -# Restore mysqldump_test_db from /dev/shm/t1/var/tmp/bug30027.sql. +# Restore mysqldump_test_db from bug30027.sql. # Check the view. set names utf8; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index a0d1195addc..3d3420b46b4 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1702,10 +1702,9 @@ CREATE VIEW mysqldump_test_db.v1 AS SELECT set names latin1; --echo ---echo # Dump mysqldump_test_db to $MYSQLTEST_VARDIR/tmp/bug30027.sql. +--echo # Dump mysqldump_test_db to bug30027.sql. --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --default-character-set=latin1 --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql -# --exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30027.sql --echo --echo # Drop mysqldump_test_db. @@ -1713,7 +1712,7 @@ set names latin1; DROP DATABASE mysqldump_test_db; --echo ---echo # Restore mysqldump_test_db from $MYSQLTEST_VARDIR/tmp/bug30027.sql. +--echo # Restore mysqldump_test_db from bug30027.sql. --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30027.sql