diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
| commit | 2bd4dc38e0d5eb257e2e29413dd01239ce075d42 (patch) | |
| tree | dad0557b1d927d012aebd1c36c8c3e00462adcb1 /sql/sql_base.h | |
| parent | 44fdb56c977259b2801c612116813beda403df78 (diff) | |
| parent | 3df261dc31ab18ee1537f327b07320b0a07fb8f5 (diff) | |
| download | mariadb-git-2bd4dc38e0d5eb257e2e29413dd01239ce075d42.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 58cd18321b7..24a7c7a5a2e 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -267,7 +267,6 @@ bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags, uint dt_phases); bool lock_tables(THD *thd, TABLE_LIST *tables, uint counter, uint flags); int decide_logging_format(THD *thd, TABLE_LIST *tables); -void free_io_cache(TABLE *entry); void intern_close_table(TABLE *entry); void kill_delayed_threads_for_table(TDC_element *element); void close_thread_table(THD *thd, TABLE **table_ptr); @@ -305,16 +304,7 @@ void close_all_tables_for_name(THD *thd, TABLE_SHARE *share, ha_extra_function extra, TABLE *skip_table); OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild); -bool tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias, - const char *cache_key, uint cache_key_length, uint flags); - -static inline bool tdc_open_view(THD *thd, TABLE_LIST *table_list, - const char *alias, uint flags) -{ - const char *key; - uint key_length= get_table_def_key(table_list, &key); - return tdc_open_view(thd, table_list, alias, key, key_length, flags); -} +bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags); TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, const char *table_name, |