1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: my_init_dynamic_array2 -> init_dynamic_array2

Browse Source
This commit is contained in:
Sergei Golubchik 2014-08-25 19:05:38 +02:00
parent 236556df3f
commit 534cbc1f2a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysys/hash.c
View File

@ -94,10 +94,9 @@ my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
hash->free=free_element; hash->free=free_element;
hash->flags=flags; hash->flags=flags;
hash->charset=charset; hash->charset=charset;
res= my_init_dynamic_array2(&hash->array, res= init_dynamic_array2(&hash->array, sizeof(HASH_LINK), NULL, size,
sizeof(HASH_LINK), NULL, size, growth_size, growth_size, MYF((flags & HASH_THREAD_SPECIFIC ?
MYF((flags & HASH_THREAD_SPECIFIC ? MY_THREAD_SPECIFIC : 0)));
MY_THREAD_SPECIFIC : 0)));
DBUG_RETURN(res); DBUG_RETURN(res);
} }

4
sql/rpl_handler.cc
View File

@ -188,8 +188,8 @@ void delegates_destroy()
} s; \ } s; \
DYNAMIC_ARRAY *plugins= &s.plugins; \ DYNAMIC_ARRAY *plugins= &s.plugins; \
plugin_ref *plugins_buffer= s.plugins_buffer; \ plugin_ref *plugins_buffer= s.plugins_buffer; \
my_init_dynamic_array2(plugins, sizeof(plugin_ref), \ init_dynamic_array2(plugins, sizeof(plugin_ref), \
plugins_buffer, 8, 8, MYF(0)); \ plugins_buffer, 8, 8, MYF(0)); \
read_lock(); \ read_lock(); \
Observer_info_iterator iter= observer_info_iter(); \ Observer_info_iterator iter= observer_info_iter(); \
Observer_info *info= iter++; \ Observer_info *info= iter++; \

7
sql/sql_lex.cc
View File

@ -2569,10 +2569,9 @@ LEX::LEX()
is_lex_started(0), limit_rows_examined_cnt(ULONGLONG_MAX) is_lex_started(0), limit_rows_examined_cnt(ULONGLONG_MAX)
{ {
my_init_dynamic_array2(&plugins, sizeof(plugin_ref), init_dynamic_array2(&plugins, sizeof(plugin_ref), plugins_static_buffer,
plugins_static_buffer, INITIAL_LEX_PLUGIN_LIST_SIZE,
INITIAL_LEX_PLUGIN_LIST_SIZE, INITIAL_LEX_PLUGIN_LIST_SIZE, 0);
INITIAL_LEX_PLUGIN_LIST_SIZE, 0);
reset_query_tables_list(TRUE); reset_query_tables_list(TRUE);
mi.init(); mi.init();
} }