Skip to content

Commit 534cbc1

Browse files
committed
cleanup: my_init_dynamic_array2 -> init_dynamic_array2
1 parent 236556d commit 534cbc1

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

mysys/hash.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
9494
hash->free=free_element;
9595
hash->flags=flags;
9696
hash->charset=charset;
97-
res= my_init_dynamic_array2(&hash->array,
98-
sizeof(HASH_LINK), NULL, size, growth_size,
99-
MYF((flags & HASH_THREAD_SPECIFIC ?
100-
MY_THREAD_SPECIFIC : 0)));
97+
res= init_dynamic_array2(&hash->array, sizeof(HASH_LINK), NULL, size,
98+
growth_size, MYF((flags & HASH_THREAD_SPECIFIC ?
99+
MY_THREAD_SPECIFIC : 0)));
101100
DBUG_RETURN(res);
102101
}
103102

sql/rpl_handler.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ void delegates_destroy()
188188
} s; \
189189
DYNAMIC_ARRAY *plugins= &s.plugins; \
190190
plugin_ref *plugins_buffer= s.plugins_buffer; \
191-
my_init_dynamic_array2(plugins, sizeof(plugin_ref), \
192-
plugins_buffer, 8, 8, MYF(0)); \
191+
init_dynamic_array2(plugins, sizeof(plugin_ref), \
192+
plugins_buffer, 8, 8, MYF(0)); \
193193
read_lock(); \
194194
Observer_info_iterator iter= observer_info_iter(); \
195195
Observer_info *info= iter++; \

sql/sql_lex.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2569,10 +2569,9 @@ LEX::LEX()
25692569
is_lex_started(0), limit_rows_examined_cnt(ULONGLONG_MAX)
25702570
{
25712571

2572-
my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
2573-
plugins_static_buffer,
2574-
INITIAL_LEX_PLUGIN_LIST_SIZE,
2575-
INITIAL_LEX_PLUGIN_LIST_SIZE, 0);
2572+
init_dynamic_array2(&plugins, sizeof(plugin_ref), plugins_static_buffer,
2573+
INITIAL_LEX_PLUGIN_LIST_SIZE,
2574+
INITIAL_LEX_PLUGIN_LIST_SIZE, 0);
25762575
reset_query_tables_list(TRUE);
25772576
mi.init();
25782577
}

0 commit comments

Comments
 (0)