mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
This commit is contained in:
@@ -560,7 +560,7 @@ class sys_var_key_buffer_size :public sys_var_key_cache_param
|
||||
{
|
||||
public:
|
||||
sys_var_key_buffer_size(const char *name_arg)
|
||||
:sys_var_key_cache_param(name_arg, offsetof(KEY_CACHE_VAR, buff_size))
|
||||
:sys_var_key_cache_param(name_arg, offsetof(KEY_CACHE, param_buff_size))
|
||||
{}
|
||||
bool update(THD *thd, set_var *var);
|
||||
SHOW_TYPE type() { return SHOW_LONGLONG; }
|
||||
@@ -755,7 +755,7 @@ public:
|
||||
my_free((char*) name, MYF(0));
|
||||
}
|
||||
friend bool process_key_caches(int (* func) (const char *name,
|
||||
KEY_CACHE_VAR *));
|
||||
KEY_CACHE *));
|
||||
friend void delete_elements(I_List<NAMED_LIST> *list,
|
||||
void (*free_element)(const char*, gptr));
|
||||
};
|
||||
@@ -788,9 +788,9 @@ gptr find_named(I_List<NAMED_LIST> *list, const char *name, uint length,
|
||||
NAMED_LIST **found);
|
||||
|
||||
/* key_cache functions */
|
||||
KEY_CACHE_VAR *get_key_cache(LEX_STRING *cache_name);
|
||||
KEY_CACHE_VAR *get_or_create_key_cache(const char *name, uint length);
|
||||
void free_key_cache(const char *name, KEY_CACHE_VAR *key_cache);
|
||||
bool process_key_caches(int (* func) (const char *name, KEY_CACHE_VAR *));
|
||||
KEY_CACHE *get_key_cache(LEX_STRING *cache_name);
|
||||
KEY_CACHE *get_or_create_key_cache(const char *name, uint length);
|
||||
void free_key_cache(const char *name, KEY_CACHE *key_cache);
|
||||
bool process_key_caches(int (* func) (const char *name, KEY_CACHE *));
|
||||
void delete_elements(I_List<NAMED_LIST> *list,
|
||||
void (*free_element)(const char*, gptr));
|
||||
|
||||
Reference in New Issue
Block a user