From: Date: September 2 2005 8:23pm
Subject: bk commit into 5.0 tree (patg:1.1946) BUG#9056
List-Archive: http://lists.mysql.com/internals/29248
X-Bug: 9056
Message-Id: <20050902182354.281247B15F3@radha.local>

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg 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.1946 05/09/02 20:23:22 patg@stripped +1 -0
  mysqldump.c:
    savepoint for work on BUG #9056 so I can do a pull!

  client/mysqldump.c
    1.195 05/09/02 20:18:31 patg@stripped +8 -4
    savepoint for work on BUG #9056

# 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:	patg
# Host:	radha.local
# Root:	/Users/patg/mysql-build/mysql-5.0.bug9056

--- 1.194/client/mysqldump.c	2005-09-01 04:02:12 +02:00
+++ 1.195/client/mysqldump.c	2005-09-02 20:18:31 +02:00
@@ -1255,6 +1255,10 @@
     /* this is a stored proc */
     if (!strcmp(row[2],"PROCEDURE"))
     {
+      if (opt_drop)
+        fprintf(sql_file, "/*!50003 DROP PROCEDURE IF EXISTS %s */ //\n",
+                quote_name(row[1], name_buff, 0));
+
       fprintf(sql_file, "/*!50003 CREATE PROCEDURE %s (%s)\n\
 LANGUAGE %s %s %s\n%s%s */ //\n\n",
               quote_name(row[1], name_buff, 0), /* name */
@@ -1268,10 +1272,10 @@
     /* else a function */
     else
     {
-#if FIGURE_OUT_COMMENTS_FOR_FUNCTIONS
-      fprintf(sql_file, "/*!50003 CREATE FUNCTION %s (%s) RETURNS %s\n\
-LANGUAGE %s %s %s\n%s%s; */ //\n\n",
-#endif
+      if (opt_drop)
+        fprintf(sql_file, "/*!50003 DROP FUNCTION IF EXISTS %s */ //\n",
+                quote_name(row[1], name_buff, 0));
+
       fprintf(sql_file, "CREATE FUNCTION %s (%s) RETURNS %s\n\
 LANGUAGE %s %s %s\n%s%s; //\n\n",
               quote_name(row[1], name_buff, 0), /* name */