bk commit into 5.0 tree (msvensson:1.2234) BUG#10877

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2006-07-24 10:56:33+02:00, msvensson@neptunus.(none) +2 -0
  Bug#10877 mysqldump should use consistent last line
   - Add printout in write_footer to tell that mysqldump has completed.
     Ex: -- Dump completed 2006-07-24  8:55:05

  client/Makefile.am@stripped, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +3 -1
    Build mysqldump with mf_getdate.c

  client/mysqldump.c@stripped, 2006-07-24 10:56:31+02:00, msvensson@neptunus.(none) +7 -0
    Add printout in write_footer that will print info that mysqldump has completed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-m-bug19745

--- 1.55/client/Makefile.am	2006-07-24 10:56:38 +02:00
+++ 1.56/client/Makefile.am	2006-07-24 10:56:38 +02:00
@@ -47,7 +47,9 @@ mysqltestmanager_pwgen_SOURCES =   mysql
 mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
 mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
 mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
-mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)
+mysqldump_SOURCES=              mysqldump.c my_user.c \
+	                        $(top_srcdir)/mysys/mf_getdate.c \
+                                $(yassl_dummy_link_fix)
 mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)
 mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)
 sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

--- 1.234/client/mysqldump.c	2006-07-24 10:56:38 +02:00
+++ 1.235/client/mysqldump.c	2006-07-24 10:56:38 +02:00
@@ -565,6 +565,13 @@ static void write_footer(FILE *sql_file)
     fprintf(sql_file,
             "/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;\n");
     fputs("\n", sql_file);
+    if (opt_comments)
+    {
+      char time_str[20];
+      get_date(time_str, GETDATE_DATE_TIME, 0);
+      fprintf(sql_file, "-- Dump completed on %s\n",
+              time_str);
+    }
     check_io(sql_file);
   }
 } /* write_footer */