diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-02-14 10:57:01 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-02-14 10:57:01 -0500 |
| commit | 3ec0c5c5ef69cdff89a7e20d08f6d6919ba894d9 (patch) | |
| tree | 7ad4ad31047987996c4626b54631df790c3abc76 /sql/mysql_priv.h | |
| parent | fe46b0ff6c862862efa5ad990f4941c03a25640e (diff) | |
| parent | 4f12094fdd942423efb612fff24d0f62e48201d8 (diff) | |
| download | mariadb-git-3ec0c5c5ef69cdff89a7e20d08f6d6919ba894d9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 85ae3fc0f5f..89fe2a016e7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -832,6 +832,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 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, TABLE_LIST *tables, COND *cond); 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)) |