bk commit into 5.1 tree (cmiller:1.2436)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 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-02-14 10:57:01-05:00, cmiller@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
  MERGE: 1.2432.1.1

  sql/mysql_priv.h@stripped, 2007-02-14 10:56:57-05:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.480.1.1

# 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.1-maint/RESYNC

--- 1.481/sql/mysql_priv.h	2007-02-14 10:57:07 -05:00
+++ 1.482/sql/mysql_priv.h	2007-02-14 10:57:07 -05:00
@@ -832,6 +832,7 @@ bool dispatch_command(enum enum_server_c
 		      char* packet, uint packet_length);
 void log_slow_statement(THD *thd);
 bool check_dup(const char *db, const char *name, TABLE_LIST *tables);
+bool compare_record(TABLE *table);
 bool append_file_to_dir(THD *thd, const char **filename_ptr, 
                         const char *table_name);
 
@@ -1101,7 +1102,8 @@ int fill_schema_user_privileges(THD *thd
 int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
 int fill_schema_table_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
 int fill_schema_column_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
-bool get_schema_tables_result(JOIN *join);
+bool get_schema_tables_result(JOIN *join,
+                              enum enum_schema_table_state executed_place);
 #define is_schema_db(X) \
   !my_strcasecmp(system_charset_info, information_schema_name.str, (X))