database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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:
gshchepa/uchum@gleb.loc
2007-10-03 02:51:17 +05:00
parent c3ffd4ac00 c81751adba
commit 8049c695c3
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3548,11 +3548,23 @@ DROP TABLE t1,t2;
# "Dump completed on"
#
# --skip-dump-date:
--
-- Dump completed
# --dump-date:
-- Dump completed on -- ::
--
-- Dump completed on x-x-x x:x:x
# --dump-date (default):
-- Dump completed on -- ::
--
-- Dump completed on x-x-x x:x:x
#
# End of 5.0 tests
#

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

@ -1582,13 +1582,16 @@ DROP TABLE t1,t2;
--echo #
--echo # --skip-dump-date:
--exec $MYSQL_DUMP --skip-dump-date test | grep 'Dump completed'
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*//
--exec $MYSQL_DUMP --skip-dump-date test
--echo # --dump-date:
--exec $MYSQL_DUMP --dump-date test | grep 'Dump completed' | tr -d '[0-9]'
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/
--exec $MYSQL_DUMP --dump-date test
--echo # --dump-date (default):
--exec $MYSQL_DUMP test | grep 'Dump completed' | tr -d '[0-9]'
--replace_regex /-- [^D][^u][^m][^p].*// /\/\*!.*// /[0-9]+/x/
--exec $MYSQL_DUMP test
--echo #
--echo # End of 5.0 tests