mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fix test so that it will be environment-independent.
mysql-test/r/mysqldump.result: Update result file.
This commit is contained in:
@ -3952,12 +3952,12 @@ CREATE VIEW mysqldump_test_db.v2 AS SELECT 1 AS
|
|||||||
CREATE VIEW mysqldump_test_db.v1 AS SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1 FROM mysqldump_test_db.v2;
|
CREATE VIEW mysqldump_test_db.v1 AS SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1 FROM mysqldump_test_db.v2;
|
||||||
set names latin1;
|
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 mysqldump_test_db.
|
||||||
DROP DATABASE 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.
|
# Check the view.
|
||||||
set names utf8;
|
set names utf8;
|
||||||
|
@ -1702,10 +1702,9 @@ CREATE VIEW mysqldump_test_db.v1 AS SELECT
|
|||||||
set names latin1;
|
set names latin1;
|
||||||
|
|
||||||
--echo
|
--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 --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
|
||||||
--echo # Drop mysqldump_test_db.
|
--echo # Drop mysqldump_test_db.
|
||||||
@ -1713,7 +1712,7 @@ set names latin1;
|
|||||||
DROP DATABASE mysqldump_test_db;
|
DROP DATABASE mysqldump_test_db;
|
||||||
|
|
||||||
--echo
|
--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
|
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30027.sql
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user