summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqldump.test
diff options
context:
space:
mode:
authorgshchepa/uchum@gleb.loc <>2007-10-03 15:05:11 +0500
committergshchepa/uchum@gleb.loc <>2007-10-03 15:05:11 +0500
commit5184ff828ccd5fa8e0edb055f6690eaf6591d1ce (patch)
tree08c08b1817fe5ce8e45a426d76a39760b95183a9 /mysql-test/t/mysqldump.test
parent96e68cfbb58b2b391185cd587ac50009ee2d39a5 (diff)
parenta6b5121b4001b6e5a3bfa1f76cf8a40c52f8ef8b (diff)
downloadmariadb-git-5184ff828ccd5fa8e0edb055f6690eaf6591d1ce.tar.gz
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into gleb.loc:/home/uchum/work/bk/5.1-opt
Diffstat (limited to 'mysql-test/t/mysqldump.test')
-rw-r--r--mysql-test/t/mysqldump.test17
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 #