bk commit into 5.0 tree (gshchepa:1.2536) 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 02:50:38+05:00, gshchepa@stripped +3 -0
  mysqldump.c, mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  client/mysqldump.c@stripped, 2007-10-03 02:48:31+05:00, gshchepa@stripped +1 -1
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@stripped, 2007-10-03 02:49:24+05:00, gshchepa@stripped +14 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@stripped, 2007-10-03 02:48:44+05:00, gshchepa@stripped +6 -3
    Bug #31077: post-commit fix.

diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
--- a/client/mysqldump.c	2007-10-01 20:32:34 +05:00
+++ b/client/mysqldump.c	2007-10-03 02:48:31 +05:00
@@ -634,7 +634,7 @@ static void write_footer(FILE *sql_file)
                 time_str);
       }
       else
-        fprintf(sql_file, "-- Dump completed");
+        fprintf(sql_file, "-- Dump completed\n");
     }
     check_io(sql_file);
   }
diff -Nrup a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
--- a/mysql-test/r/mysqldump.result	2007-10-01 20:33:05 +05:00
+++ b/mysql-test/r/mysqldump.result	2007-10-03 02:49:24 +05:00
@@ -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
 #
diff -Nrup a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/mysqldump.test	2007-10-01 20:33:01 +05:00
+++ b/mysql-test/t/mysqldump.test	2007-10-03 02:48:44 +05:00
@@ -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