bk commit into 4.1 tree (reggie:1.2153) BUG#9175

[reggie]

Below is the list of changes that have just been committed into a local
4.1 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.2153 05/03/28 13:06:43 reggie@mdk10.(none) +1 -0
  Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent' 
  
  My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was
returning rows.  Now I check that the resultset is not null and has at least 1 row before
I process the table.
  
  mysqldump.c:
    Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any
rows

  client/mysqldump.c
    1.184 05/03/28 13:05:09 reggie@mdk10.(none) +21 -10
    Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any
rows

# 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-4.1

--- 1.183/client/mysqldump.c	2005-03-16 14:56:38 -06:00
+++ 1.184/client/mysqldump.c	2005-03-28 13:05:09 -06:00
@@ -2113,10 +2113,10 @@
   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)
 {
@@ -2137,9 +2137,19 @@
   }
 
   tableRes= mysql_store_result( sock );
-  row= mysql_fetch_row( tableRes );
-  strmake(new_table_name, row[0], buf_size-1);
-  mysql_free_result(tableRes);
+  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);
+		return 0;
+	}
+  	mysql_free_result(tableRes);
+	return 1;
+  }
+  return 1;
 }
 
 
@@ -2179,11 +2189,12 @@
      char new_table_name[NAME_LEN];
 
      /* the table name passed on commandline may be wrong case */
-     get_actual_table_name( *table_names, new_table_name, sizeof(new_table_name) );
-
-    numrows = getTableStructure(new_table_name, db);
-    if (!dFlag && numrows > 0)
-      dumpTable(numrows, new_table_name);
+     if (!get_actual_table_name( *table_names, new_table_name, sizeof(new_table_name) ))
+     {
+	    numrows = getTableStructure(new_table_name, db);
+	    if (!dFlag && numrows > 0)
+	      dumpTable(numrows, new_table_name);
+     }
     my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));
     order_by= 0;
   }