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

into  gleb.loc:/home/uchum/work/bk/5.0-opt
This commit is contained in:
unknown 2007-10-03 11:37:29 +05:00
commit a408f34866
2 changed files with 4 additions and 4 deletions

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 completed on x-x-x x:x:x
-- Dump completed on DATE
#
# End of 5.0 tests
#

View file

@ -1586,11 +1586,11 @@ DROP TABLE t1,t2;
--exec $MYSQL_DUMP --skip-dump-date test
--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
--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
--echo #