diff options
| author | igor@rurik.mysql.com <> | 2003-10-30 10:45:28 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-10-30 10:45:28 -0800 |
| commit | f29ed57531b99b09a81b6f68b570ef3a5a26d865 (patch) | |
| tree | bfd8508896ec045400e82650920bcfd37e53a8f1 /sql/mysql_priv.h | |
| parent | 2dadbb3153f7d2f98f4ef37f7758e59e3959a831 (diff) | |
| parent | f17ff0bc39135b417a3a120dbb59d5a9389d8221 (diff) | |
| download | mariadb-git-f29ed57531b99b09a81b6f68b570ef3a5a26d865.tar.gz | |
Merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 1926314cef1..ce5c9ff0924 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -419,6 +419,10 @@ bool check_stack_overrun(THD *thd,char *dummy); void table_cache_init(void); void table_cache_free(void); uint cached_tables(void); +void assign_cache_init(void); +void assign_cache_free(void); +void reassign_key_cache(KEY_CACHE_ASMT *key_cache_asmt, + KEY_CACHE_VAR *new_key_cache); void kill_mysql(void); void close_connection(THD *thd, uint errcode, bool lock); bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, @@ -448,7 +452,10 @@ int mysql_analyze_table(THD* thd, TABLE_LIST* table_list, HA_CHECK_OPT* check_opt); int mysql_optimize_table(THD* thd, TABLE_LIST* table_list, HA_CHECK_OPT* check_opt); +int mysql_assign_to_keycache(THD* thd, TABLE_LIST* table_list); int mysql_preload_keys(THD* thd, TABLE_LIST* table_list); +int reassign_keycache_tables(THD* thd, KEY_CACHE_VAR* src_cache, + char *dest_name, bool remove_fl); bool check_simple_select(); @@ -821,7 +828,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_error_log, LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone, LOCK_slave_list, LOCK_active_mi, LOCK_manager, - LOCK_global_system_variables, LOCK_user_conn; + LOCK_global_system_variables, LOCK_user_conn, LOCK_assign; extern rw_lock_t LOCK_grant; extern pthread_cond_t COND_refresh, COND_thread_count, COND_manager; extern pthread_attr_t connection_attrib; |