diff options
| author | unknown <iggy@recycle.(none)> | 2007-04-02 16:22:19 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-04-02 16:22:19 -0400 |
| commit | c9cc8bae48a8b1f91cbea2c7aa68506689a3387a (patch) | |
| tree | ff5d0b01faf7fdf9f9ebd5f2f57d003ab2a849e4 /mysql-test/t/mysqldump.test | |
| parent | f75f2912b6299afbc88f344b1d5f2c7fe097e25a (diff) | |
| parent | f7417a299eddf6212996c357f79b2715af98567b (diff) | |
| download | mariadb-git-c9cc8bae48a8b1f91cbea2c7aa68506689a3387a.tar.gz | |
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
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 89e20e527d5..49adda73f2d 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -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; |