diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:27:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-01 16:27:03 +0300 |
| commit | 1ed585adff48bffbd5440eda246e1918d53ca7ac (patch) | |
| tree | f22662f715c12704721d57ac2670684f125d9eba /sql/mysql_priv.h | |
| parent | 379a441d9cc2c60585f96150bcacb41312c260f6 (diff) | |
| download | mariadb-git-1ed585adff48bffbd5440eda246e1918d53ca7ac.tar.gz | |
Backport of:
---------------------------------------------
2630.7.3 Konstantin Osipov 2008-06-02
Various style changes preceding the removal of reopen_table().
(Post-review fixes for WL#3726).
sql/event_db_repository.cc:
Update to use the new signature of TABLE_LIST::init_one_table().
sql/mysql_priv.h:
Move close_cached_table() and wait_while_table_is_used()
to sql_base.cc.
sql/sql_base.cc:
Move close_cached_table() and wait_while_table_is_used()
from sql_table.cc.
sql/sql_table.cc:
Move close_cached_table() and wait_while_table_is_used()
to sql_base.cc.
sql/table.h:
Update the signature of TABLE_LIST::init_one_table().
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 3e3d3b6df24..a29e819f90b 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1033,8 +1033,6 @@ 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); -bool wait_while_table_is_used(THD *thd, TABLE *table, - enum ha_extra_function function); bool table_def_init(void); void table_def_free(void); void assign_new_table_id(TABLE_SHARE *share); @@ -1390,6 +1388,9 @@ void add_join_on(TABLE_LIST *b,Item *expr); void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields, SELECT_LEX *lex); bool add_proc_to_list(THD *thd, Item *item); +bool close_cached_table(THD *thd, TABLE *table); +bool wait_while_table_is_used(THD *thd, TABLE *table, + enum ha_extra_function function); void unlink_open_table(THD *thd, TABLE *find, bool unlock); void drop_open_table(THD *thd, TABLE *table, const char *db_name, const char *table_name); |