bk commit into 5.0 tree (gluh:1.1848) BUG#9317

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.1848 05/03/25 13:31:29 gluh@stripped +1 -0
  Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)

  sql/sql_show.cc
    1.227 05/03/25 13:31:21 gluh@stripped +5 -13
    Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after 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:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-5.0

--- 1.226/sql/sql_show.cc	Thu Mar 24 16:32:04 2005
+++ 1.227/sql/sql_show.cc	Fri Mar 25 13:31:21 2005
@@ -1988,9 +1988,7 @@
   restore_record(table, s->default_values);
   table->field[1]->store(db_name, strlen(db_name), system_charset_info);
   table->field[2]->store(cs_name, strlen(cs_name), system_charset_info);
-  if (schema_table_store_record(thd, table))
-    return 1;
-  return 0;
+  return schema_table_store_record(thd, table);
 }
 
 
@@ -2231,9 +2229,7 @@
       }
     }
   }
-  if (schema_table_store_record(thd, table))
-    DBUG_RETURN(1);
-  DBUG_RETURN(0);
+  DBUG_RETURN(schema_table_store_record(thd, table));
 }
 
 
@@ -2582,8 +2578,7 @@
       get_field(thd->mem_root, proc_table->field[15], &tmp_string);
       table->field[18]->store(tmp_string.ptr(), tmp_string.length(), cs);
       table->field[19]->store(definer, strlen(definer), cs);
-      if (schema_table_store_record(thd, table))
-        return 1;
+      return schema_table_store_record(thd, table);
     }
   }
   return 0;
@@ -2761,8 +2756,7 @@
         table->field[5]->store("YES", 3, cs);
       else
         table->field[5]->store("NO", 2, cs);
-      if (schema_table_store_record(thd, table))
-        DBUG_RETURN(1);
+      DBUG_RETURN(schema_table_store_record(thd, table));
     }
   }
   else
@@ -2787,9 +2781,7 @@
   table->field[3]->store(db, strlen(db), cs);
   table->field[4]->store(tname, strlen(tname), cs);
   table->field[5]->store(con_type, con_len, cs);
-  if (schema_table_store_record(thd, table))
-    return 1;
-  return 0;
+  return schema_table_store_record(thd, table);
 }