mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
Merge recycle.(none):/src/bug23491_ii/my50-bug23491_ii
into recycle.(none):/src/bug23491_ii/my51-bug23491_ii mysql-test/t/mysqldump.test: Auto merged
This commit is contained in:
commit
c9cc8bae48
1 changed files with 3 additions and 3 deletions
|
@ -919,7 +919,7 @@ port=1234
|
|||
EOF
|
||||
--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1
|
||||
--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 mysqltest1
|
||||
--remov_file $MYSQLTEST_VARDIR/tmp/tmp.cnf
|
||||
--remove_file $MYSQLTEST_VARDIR/tmp/tmp.cnf
|
||||
|
||||
--echo #
|
||||
--echo # Test of fix to BUG 12597
|
||||
|
@ -1482,10 +1482,10 @@ create function f2() returns int return f1();
|
|||
create view v3 as select bug23491_original.f1();
|
||||
|
||||
# Backup.
|
||||
--exec $MYSQL_DUMP --skip-comments -uroot --opt --routines bug23491_original > $MYSQLTEST_VARDIR/tmp/bug23491_backup.sql;
|
||||
--exec $MYSQL_DUMP --skip-comments -uroot --opt --routines bug23491_original > $MYSQLTEST_VARDIR/tmp/bug23491_backup.sql
|
||||
|
||||
# Restore.
|
||||
--exec $MYSQL bug23491_restore < $MYSQLTEST_VARDIR/tmp/bug23491_backup.sql;
|
||||
--exec $MYSQL bug23491_restore < $MYSQLTEST_VARDIR/tmp/bug23491_backup.sql
|
||||
|
||||
# Verify
|
||||
use bug23491_restore;
|
||||
|
|
Loading…
Add table
Reference in a new issue