bk commit into 4.0 tree (jimw:1.2076) BUG#9492

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.0 repository of jimw. When jimw 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.2076 05/03/31 11:43:39 jimw@stripped +1 -0
  Fix segmentation fault in mysqlcheck when the last table
  checked with --auto-repair mode returned an error (such
  as being a merge table). (Bug #9492)

  client/mysqlcheck.c
    1.31 05/03/31 11:40:59 jimw@stripped +2 -1
    When testing whether the last table should be added to the list of tables to
    be repaired, we don't have a valid row[] to look at, so don't.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.0-9492

--- 1.30/client/mysqlcheck.c	2004-09-06 13:48:39 -07:00
+++ 1.31/client/mysqlcheck.c	2005-03-31 11:40:59 -08:00
@@ -537,6 +537,7 @@
   my_bool found_error=0;
 
   res = mysql_use_result(sock);
+
   prev[0] = '\0';
   for (i = 0; (row = mysql_fetch_row(res)); i++)
   {
@@ -565,7 +566,7 @@
     putchar('\n');
   }
   if (found_error && opt_auto_repair && what_to_do != DO_REPAIR
&&
-      (!opt_fast || strcmp(row[3],"OK")))
+      !opt_fast)
     insert_dynamic(&tables4repair, prev);
   mysql_free_result(res);
 }