bk commit into 5.0 tree (reggie:1.1855)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie 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.1855 05/04/01 08:35:33 reggie@mdk10.(none) +1 -0
  Merge

  client/mysqldump.c
    1.175 05/04/01 08:33:35 reggie@mdk10.(none) +21 -27
    merged changes for bug #9175

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-5.0/RESYNC

--- 1.174/client/mysqldump.c	2005-03-21 15:41:20 -06:00
+++ 1.175/client/mysqldump.c	2005-04-01 08:33:35 -06:00
@@ -2218,13 +2218,14 @@
   different case (e.g.  T1 vs t1)
   
   RETURN
-    void
+    int - 0 if a tablename was retrieved.  1 if not
 */
 
-static void get_actual_table_name(const char *old_table_name, 
+static int get_actual_table_name(const char *old_table_name, 
                                   char *new_table_name, 
                                   int buf_size)
 {
+  int retval;
   MYSQL_RES  *tableRes;
   MYSQL_ROW  row;
   char query[50 + 2*NAME_LEN];
@@ -2242,9 +2243,19 @@
   }
 
   tableRes= mysql_store_result( sock );
-  row= mysql_fetch_row( tableRes );
-  strmake(new_table_name, row[0], buf_size-1);
-  mysql_free_result(tableRes);
+  retval = 1;
+  if (tableRes != NULL)
+  {
+	my_ulonglong numRows = mysql_num_rows(tableRes);
+	if (numRows > 0)
+	{
+	  	row= mysql_fetch_row( tableRes );
+	  	strmake(new_table_name, row[0], buf_size-1);
+		retval = 0;
+	}
+  	mysql_free_result(tableRes);
+  }
+  return retval;
 }
 
 
@@ -2284,11 +2295,13 @@
      char new_table_name[NAME_LEN];
 
      /* the table name passed on commandline may be wrong case */
-     get_actual_table_name( table_names[i], new_table_name, sizeof(new_table_name) );
+     if (!get_actual_table_name( table_names[i], new_table_name, sizeof(new_table_name) ))
+     {
 
-    numrows = getTableStructure(new_table_name, db);
+    	numrows = getTableStructure(new_table_name, db);
 
-    dumpTable(numrows, new_table_name);
+    	dumpTable(numrows, new_table_name);
+     }
     my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
     order_by= 0;
   }