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

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

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
 #

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 #