database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077

Browse Source 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
This commit is contained in:
unknown
2007-10-03 11:37:29 +05:00
parent df4e28e75b b802af43cb
commit a408f34866
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/mysqldump.result
View File

@@ -3558,13 +3558,13 @@ DROP TABLE t1,t2;
-- Dump completed on x-x-x x:x:x -- Dump completed on DATE
# --dump-date (default): # --dump-date (default):
-- --
-- Dump completed on x-x-x x:x:x -- Dump completed on DATE
# #
# End of 5.0 tests # End of 5.0 tests
# #

4
mysql-test/t/mysqldump.test
View File

@@ -1586,11 +1586,11 @@ DROP TABLE t1,t2;
--exec $MYSQL_DUMP --skip-dump-date test --exec $MYSQL_DUMP --skip-dump-date test
--echo # --dump-date: --echo # --dump-date:
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/ --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
--exec $MYSQL_DUMP --dump-date test --exec $MYSQL_DUMP --dump-date test
--echo # --dump-date (default): --echo # --dump-date (default):
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/ --replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// / on [0-9 :-]+/ on DATE/
--exec $MYSQL_DUMP test --exec $MYSQL_DUMP test
--echo # --echo #