bk commit into 5.0 tree (gshchepa:1.2537) BUG#31077

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-03 11:36:42+05:00, gshchepa@stripped +2 -0
  mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@stripped, 2007-10-03 11:36:20+05:00, gshchepa@stripped +2 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@stripped, 2007-10-03 11:36:18+05:00, gshchepa@stripped +2 -2
    Bug #31077: post-commit fix.

diff -Nrup a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
--- a/mysql-test/r/mysqldump.result	2007-10-03 02:49:24 +05:00
+++ b/mysql-test/r/mysqldump.result	2007-10-03 11:36:20 +05:00
@@ -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
 #
diff -Nrup a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/mysqldump.test	2007-10-03 02:48:44 +05:00
+++ b/mysql-test/t/mysqldump.test	2007-10-03 11:36:18 +05:00
@@ -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 #