diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-02-13 23:35:06 +0100 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-02-13 23:35:06 +0100 |
| commit | 579c926de004af406ce6aa3f2eae84c9cdf0781b (patch) | |
| tree | e7c9c5ef34c15e106ecfffeae09f22401013ba30 /sql/mysql_priv.h | |
| parent | e5c1656e978894d3c021ce4e702c9e03ef0fe7ca (diff) | |
| parent | e656c582bc68ed708e2a74c78487cca5528907e1 (diff) | |
| download | mariadb-git-579c926de004af406ce6aa3f2eae84c9cdf0781b.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
BitKeeper/etc/gone:
auto-union
mysys/my_getopt.c:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/select.result:
Manual merge
mysql-test/t/select.test:
Manual merge
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 1bde8306072..0948487869a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -708,6 +708,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, query_id_t query_id); bool table_cache_init(void); void table_cache_free(void); @@ -938,7 +939,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)) |