diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-10-03 15:05:11 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-10-03 15:05:11 +0500 |
| commit | c1548d74421d102a2a729e981c629bbc9effc0f3 (patch) | |
| tree | 08c08b1817fe5ce8e45a426d76a39760b95183a9 /mysql-test/t/mysqldump.test | |
| parent | ee1640701635b4ebcb1309388c90dcf49be3f4cb (diff) | |
| parent | b802af43cb606df0b3db593a20a7a71ec600ea86 (diff) | |
| download | mariadb-git-c1548d74421d102a2a729e981c629bbc9effc0f3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into gleb.loc:/home/uchum/work/bk/5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
client/client_priv.h:
Merge with 5.0-opt.
mysql-test/r/mysqldump.result:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 0440b0fb63a..158e8a769bd 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1577,6 +1577,23 @@ SELECT * FROM t2; DROP TABLE t1,t2; --echo # +--echo # Bug#29815: new option for suppressing last line of mysqldump: +--echo # "Dump completed on" +--echo # + +--echo # --skip-dump-date: +--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// +--exec $MYSQL_DUMP --skip-dump-date test + +--echo # --dump-date: +--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ +--exec $MYSQL_DUMP --dump-date test + +--echo # --dump-date (default): +--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/ +--exec $MYSQL_DUMP test + +--echo # --echo # End of 5.0 tests --echo # |