MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Patrick Galbraith Date:September 27 2005 4:41pm
Subject:bk commit into 5.0 tree (patg:1.1999) BUG#7815
View as plain text  
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.1999 05/09/27 09:40:51 patg@stripped +1 -0
  BUG #7815 - Post-review fixes required for push.

  client/mysqldump.c
    1.203 05/09/27 09:40:42 patg@stripped +5 -5
    BUG #7815
    
    Pre-push fixes requested per Sergei's review.

# 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:	krsna.patg.net
# Root:	/home/patg/mysql-5.0

--- 1.202/client/mysqldump.c	2005-09-26 22:42:57 -07:00
+++ 1.203/client/mysqldump.c	2005-09-27 09:40:42 -07:00
@@ -2959,7 +2959,7 @@
 
 char check_if_ignore_table(const char *table_name, char *table_type)
 {
-  bool result= IGNORE_NONE;
+  char result= IGNORE_NONE;
   char buff[FN_REFLEN+80], show_name_buff[FN_REFLEN];
   MYSQL_RES *res;
   MYSQL_ROW row;
@@ -2977,7 +2977,7 @@
 	fprintf(stderr,
 		"-- Warning: Couldn't get status information for table %s (%s)\n",
 		table_name,mysql_error(sock));
-      DBUG_RETURN(IGNORE_NONE);                       /* assume table is ok */
+      DBUG_RETURN(result);                       /* assume table is ok */
     }
   }
   if (!(row= mysql_fetch_row(res)))
@@ -2986,10 +2986,10 @@
 	    "Error: Couldn't read status information for table %s (%s)\n",
 	    table_name, mysql_error(sock));
     mysql_free_result(res);
-    DBUG_RETURN(IGNORE_NONE);                         /* assume table is ok */
+    DBUG_RETURN(result);                         /* assume table is ok */
   }
   if (!(row[1]))
-      strcpy(table_type,"VIEW");
+      strmake(table_type,"VIEW", NAME_LEN-1);
   else
   {
     /*
@@ -2998,7 +2998,7 @@
       these types, but we do want to use delayed inserts in the dump if
       the table type is _NOT_ one of these types
     */
-    sprintf(table_type, "%s",row[1]);
+    strmake(table_type, row[1], NAME_LEN-1);
     if (opt_delayed)
     {
       if (strcmp(table_type,"MyISAM") &&
Thread
bk commit into 5.0 tree (patg:1.1999) BUG#7815Patrick Galbraith27 Sep