diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-25 19:05:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-11 18:53:04 +0200 |
| commit | 534cbc1f2affb2953f3ad988b027e5bc116de0eb (patch) | |
| tree | 1d6702fdbdb9550fa26751712e8f26cf5b317c22 | |
| parent | 236556df3fc6ab4be1751f1c611c4ae46a4c82f4 (diff) | |
| download | mariadb-git-534cbc1f2affb2953f3ad988b027e5bc116de0eb.tar.gz | |
cleanup: my_init_dynamic_array2 -> init_dynamic_array2
| -rw-r--r-- | mysys/hash.c | 7 | ||||
| -rw-r--r-- | sql/rpl_handler.cc | 4 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 4ef731cde15..a501f7d38f7 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -94,10 +94,9 @@ my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset, hash->free=free_element; hash->flags=flags; hash->charset=charset; - res= my_init_dynamic_array2(&hash->array, - sizeof(HASH_LINK), NULL, size, growth_size, - MYF((flags & HASH_THREAD_SPECIFIC ? - MY_THREAD_SPECIFIC : 0))); + res= init_dynamic_array2(&hash->array, sizeof(HASH_LINK), NULL, size, + growth_size, MYF((flags & HASH_THREAD_SPECIFIC ? + MY_THREAD_SPECIFIC : 0))); DBUG_RETURN(res); } diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index 2777dabf451..a706fcd37ee 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -188,8 +188,8 @@ void delegates_destroy() } s; \ DYNAMIC_ARRAY *plugins= &s.plugins; \ plugin_ref *plugins_buffer= s.plugins_buffer; \ - my_init_dynamic_array2(plugins, sizeof(plugin_ref), \ - plugins_buffer, 8, 8, MYF(0)); \ + init_dynamic_array2(plugins, sizeof(plugin_ref), \ + plugins_buffer, 8, 8, MYF(0)); \ read_lock(); \ Observer_info_iterator iter= observer_info_iter(); \ Observer_info *info= iter++; \ diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 43bc288380a..45045ff54a0 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2569,10 +2569,9 @@ LEX::LEX() is_lex_started(0), limit_rows_examined_cnt(ULONGLONG_MAX) { - my_init_dynamic_array2(&plugins, sizeof(plugin_ref), - plugins_static_buffer, - INITIAL_LEX_PLUGIN_LIST_SIZE, - INITIAL_LEX_PLUGIN_LIST_SIZE, 0); + init_dynamic_array2(&plugins, sizeof(plugin_ref), plugins_static_buffer, + INITIAL_LEX_PLUGIN_LIST_SIZE, + INITIAL_LEX_PLUGIN_LIST_SIZE, 0); reset_query_tables_list(TRUE); mi.init(); } |