bk commit into 5.0 tree (cmiller:1.2422)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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@stripped, 2007-03-07 15:07:58-05:00, cmiller@stripped +1 -0
  Make it safe for use against databases before when views appeared.

  client/mysqlcheck.c@stripped, 2007-03-07 15:07:56-05:00, cmiller@stripped +6 -3
    Make it safe for use against databases before when views appeared.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-comeng--bug25347

--- 1.59/client/mysqlcheck.c	2007-03-07 15:08:02 -05:00
+++ 1.60/client/mysqlcheck.c	2007-03-07 15:08:02 -05:00
@@ -453,14 +453,17 @@ static int process_all_tables_in_db(char
 {
   MYSQL_RES *res;
   MYSQL_ROW row;
+  uint num_columns;
 
   LINT_INIT(res);
   if (use_db(database))
     return 1;
-  if (mysql_query(sock, "SHOW FULL TABLES") ||
+  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||
 	!((res= mysql_store_result(sock))))
     return 1;
 
+  num_columns= mysql_num_fields(res);
+
   if (opt_all_in_1)
   {
     /*
@@ -483,7 +486,7 @@ static int process_all_tables_in_db(char
     }
     for (end = tables + 1; (row = mysql_fetch_row(res)) ;)
     {
-      if (strcmp(row[1], "VIEW") == 0)
+      if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))
         continue;
 
       end= fix_table_name(end, row[0]);
@@ -498,7 +501,7 @@ static int process_all_tables_in_db(char
   {
     while ((row = mysql_fetch_row(res)))
     {
-      if (strcmp(row[1], "VIEW") == 0)
+      if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))
         continue;
 
       handle_request_for_tables(row[0], strlen(row[0]));