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

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

Merge gleb.loc:/home/uchum/work/bk/5.0-opt-31077
into gleb.loc:/home/uchum/work/bk/5.0-opt
0918fe83 · gshchepa/uchum@gleb.loc · 8049c695 · a6b5121b · 0918fe83 · 0918fe83
Commit 0918fe83 authored Oct 03, 2007 by gshchepa/uchum@gleb.loc
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

mysql-test/r/mysqldump.result mysql-test/r/mysqldump.result +2 -2

mysql-test/t/mysqldump.test mysql-test/t/mysqldump.test +2 -2

No files found.
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -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
 #
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -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 #