diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-11-03 12:37:02 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-11-03 12:37:02 +0100 |
| commit | fc863ba96f9772dc01ffcdf0a394f4165c8df83b (patch) | |
| tree | 850f4bb2579f83fce380d670e77b4af5532c6bfd /sql/item_create.cc | |
| parent | 1daca0f9d79797be0149c6260e02dfcc655afffc (diff) | |
| parent | 76256e887507d71e96ac120c18aa18c1e28b3262 (diff) | |
| download | mariadb-git-fc863ba96f9772dc01ffcdf0a394f4165c8df83b.tar.gz | |
Merge
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 5e419d40152..070ab5263dd 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -5007,14 +5007,14 @@ int item_create_init() DBUG_ENTER("item_create_init"); - if (hash_init(& native_functions_hash, - system_charset_info, - array_elements(func_array), - 0, - 0, - (hash_get_key) get_native_fct_hash_key, - NULL, /* Nothing to free */ - MYF(0))) + if (my_hash_init(& native_functions_hash, + system_charset_info, + array_elements(func_array), + 0, + 0, + (my_hash_get_key) get_native_fct_hash_key, + NULL, /* Nothing to free */ + MYF(0))) DBUG_RETURN(1); for (func= func_array; func->builder != NULL; func++) @@ -5026,7 +5026,7 @@ int item_create_init() #ifndef DBUG_OFF for (uint i=0 ; i < native_functions_hash.records ; i++) { - func= (Native_func_registry*) hash_element(& native_functions_hash, i); + func= (Native_func_registry*) my_hash_element(& native_functions_hash, i); DBUG_PRINT("info", ("native function: %s length: %u", func->name.str, (uint) func->name.length)); } @@ -5044,7 +5044,7 @@ int item_create_init() void item_create_cleanup() { DBUG_ENTER("item_create_cleanup"); - hash_free(& native_functions_hash); + my_hash_free(& native_functions_hash); DBUG_VOID_RETURN; } @@ -5055,9 +5055,9 @@ find_native_function_builder(THD *thd, LEX_STRING name) Create_func *builder= NULL; /* Thread safe */ - func= (Native_func_registry*) hash_search(& native_functions_hash, - (uchar*) name.str, - name.length); + func= (Native_func_registry*) my_hash_search(& native_functions_hash, + (uchar*) name.str, + name.length); if (func) { |