diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 20:20:17 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 20:20:17 -0700 |
| commit | 09e7be1d821831eee3bdeb0126a92aa7c23bed7d (patch) | |
| tree | 1e1f87443b0524fc4518025161bb250daa10cb18 /sql/mysql_priv.h | |
| parent | 7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07 (diff) | |
| download | mariadb-git-09e7be1d821831eee3bdeb0126a92aa7c23bed7d.tar.gz | |
Manual merge after improving concurrency for key cache reassignment
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 06cee8018f8..4254d01f903 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -396,6 +396,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, @@ -425,7 +429,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(); @@ -797,6 +804,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, 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_assign; extern rw_lock_t LOCK_grant; extern pthread_cond_t COND_refresh, COND_thread_count, COND_manager; extern pthread_attr_t connection_attrib; |