List:Internals« Previous MessageNext Message »
From:paul Date:October 28 2005 7:26pm
Subject:bk commit into 5.0 tree (paul:1.1954)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of paul. When paul 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
  1.1954 05/10/28 14:26:22 paul@stripped +1 -0
  Merge paul@stripped:/home/bk/mysql-5.0
  into  frost.snake.net:/Users/paul/bk/mysql-5.0

  client/mysqldump.c
    1.212 05/10/28 14:26:10 paul@stripped +0 -0
    Auto merged

# 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:	paul
# Host:	frost.snake.net
# Root:	/Users/paul/bk/mysql-5.0/RESYNC

--- 1.211/client/mysqldump.c	2005-10-25 12:49:52 -05:00
+++ 1.212/client/mysqldump.c	2005-10-28 14:26:10 -05:00
@@ -1460,6 +1460,8 @@
             {
               fprintf(sql_file, "/*!50001 DROP VIEW IF EXISTS %s*/;\n",
                       opt_quoted_table);
+              fprintf(sql_file, "/*!50001 DROP TABLE IF EXISTS %s*/;\n",
+                      opt_quoted_table);
               check_io(sql_file);
             }
 
@@ -1471,7 +1473,8 @@
             */
             row= mysql_fetch_row(result);
 
-            fprintf(sql_file, "  %s %s", quote_name(row[0], name_buff, 0), row[1]);
+            fprintf(sql_file, "  %s %s", quote_name(row[0], name_buff, 0),
+                    row[1]);
 
             while((row= mysql_fetch_row(result)))
             {
Thread
bk commit into 5.0 tree (paul:1.1954)paul29 Oct