Commit 0487a1a0 authored by MySQL Build Team's avatar MySQL Build Team

The "hash_*" functions have got a prefix "my_" in 2008.

Recently, the "#define" directives mapping the old names to the new ones
have been removed, so now all callers must use the new names.

This change was missing in the DB2 storage handler modules.
parent a26aa843
...@@ -164,10 +164,10 @@ int32 initCharsetSupport() ...@@ -164,10 +164,10 @@ int32 initCharsetSupport()
} }
VOID(pthread_mutex_init(&textDescMapHashMutex,MY_MUTEX_INIT_FAST)); VOID(pthread_mutex_init(&textDescMapHashMutex,MY_MUTEX_INIT_FAST));
hash_init(&textDescMapHash, &my_charset_bin, 10, offsetof(TextDescMap, hashKey), sizeof(TextDescMap::hashKey), 0, 0, HASH_UNIQUE); my_hash_init(&textDescMapHash, &my_charset_bin, 10, offsetof(TextDescMap, hashKey), sizeof(TextDescMap::hashKey), 0, 0, HASH_UNIQUE);
VOID(pthread_mutex_init(&iconvMapHashMutex,MY_MUTEX_INIT_FAST)); VOID(pthread_mutex_init(&iconvMapHashMutex,MY_MUTEX_INIT_FAST));
hash_init(&iconvMapHash, &my_charset_bin, 10, offsetof(IconvMap, hashKey), sizeof(IconvMap::hashKey), 0, 0, HASH_UNIQUE); my_hash_init(&iconvMapHash, &my_charset_bin, 10, offsetof(IconvMap, hashKey), sizeof(IconvMap::hashKey), 0, 0, HASH_UNIQUE);
init_alloc_root(&textDescMapMemroot, 2048, 0); init_alloc_root(&textDescMapMemroot, 2048, 0);
init_alloc_root(&iconvMapMemroot, 256, 0); init_alloc_root(&iconvMapMemroot, 256, 0);
...@@ -191,9 +191,9 @@ void doneCharsetSupport() ...@@ -191,9 +191,9 @@ void doneCharsetSupport()
free_root(&iconvMapMemroot, 0); free_root(&iconvMapMemroot, 0);
pthread_mutex_destroy(&textDescMapHashMutex); pthread_mutex_destroy(&textDescMapHashMutex);
hash_free(&textDescMapHash); my_hash_free(&textDescMapHash);
pthread_mutex_destroy(&iconvMapHashMutex); pthread_mutex_destroy(&iconvMapHashMutex);
hash_free(&iconvMapHash); my_hash_free(&iconvMapHash);
free_aligned(QlgCvtTextDescToDesc_sym); free_aligned(QlgCvtTextDescToDesc_sym);
} }
...@@ -415,7 +415,7 @@ static int32 convertTextDesc(const int32 inType, const int32 outType, const char ...@@ -415,7 +415,7 @@ static int32 convertTextDesc(const int32 inType, const int32 outType, const char
memcpy(hashKey.inDesc, inDescOverride, len); memcpy(hashKey.inDesc, inDescOverride, len);
memset(hashKey.inDesc+len, 0, sizeof(hashKey.inDesc) - len); memset(hashKey.inDesc+len, 0, sizeof(hashKey.inDesc) - len);
if (!(mapping=(TextDescMap *) hash_search(&textDescMapHash, if (!(mapping=(TextDescMap *) my_hash_search(&textDescMapHash,
(const uchar*)&hashKey, (const uchar*)&hashKey,
sizeof(hashKey)))) sizeof(hashKey))))
{ {
...@@ -748,7 +748,7 @@ int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs, ...@@ -748,7 +748,7 @@ int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs,
/* Look for the conversion in the cache and add it if it is not there. */ /* Look for the conversion in the cache and add it if it is not there. */
IconvMap *mapping; IconvMap *mapping;
if (!(mapping= (IconvMap *) hash_search(&iconvMapHash, if (!(mapping= (IconvMap *) my_hash_search(&iconvMapHash,
(const uchar*)&hashKey, (const uchar*)&hashKey,
sizeof(hashKey)))) sizeof(hashKey))))
{ {
......
...@@ -284,8 +284,8 @@ static int ibmdb2i_init_func(void *p) ...@@ -284,8 +284,8 @@ static int ibmdb2i_init_func(void *p)
was_ILE_inited = false; was_ILE_inited = false;
ibmdb2i_hton= (handlerton *)p; ibmdb2i_hton= (handlerton *)p;
VOID(pthread_mutex_init(&ibmdb2i_mutex,MY_MUTEX_INIT_FAST)); VOID(pthread_mutex_init(&ibmdb2i_mutex,MY_MUTEX_INIT_FAST));
(void) hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0, (void) my_hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0,
(hash_get_key) ibmdb2i_get_key,0,0); (my_hash_get_key) ibmdb2i_get_key,0,0);
ibmdb2i_hton->state= SHOW_OPTION_YES; ibmdb2i_hton->state= SHOW_OPTION_YES;
ibmdb2i_hton->create= ibmdb2i_create_handler; ibmdb2i_hton->create= ibmdb2i_create_handler;
...@@ -340,7 +340,7 @@ static int ibmdb2i_done_func(void *p) ...@@ -340,7 +340,7 @@ static int ibmdb2i_done_func(void *p)
doneCharsetSupport(); doneCharsetSupport();
hash_free(&ibmdb2i_open_tables); my_hash_free(&ibmdb2i_open_tables);
pthread_mutex_destroy(&ibmdb2i_mutex); pthread_mutex_destroy(&ibmdb2i_mutex);
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -356,7 +356,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table) ...@@ -356,7 +356,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
pthread_mutex_lock(&ibmdb2i_mutex); pthread_mutex_lock(&ibmdb2i_mutex);
length=(uint) strlen(table_name); length=(uint) strlen(table_name);
if (!(share=(IBMDB2I_SHARE*) hash_search(&ibmdb2i_open_tables, if (!(share=(IBMDB2I_SHARE*) my_hash_search(&ibmdb2i_open_tables,
(uchar*)table_name, (uchar*)table_name,
length))) length)))
{ {
...@@ -387,7 +387,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table) ...@@ -387,7 +387,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
if (rc) if (rc)
{ {
delete share->db2Table; delete share->db2Table;
hash_delete(&ibmdb2i_open_tables, (uchar*) share); my_hash_delete(&ibmdb2i_open_tables, (uchar*) share);
thr_lock_delete(&share->lock); thr_lock_delete(&share->lock);
my_errno = rc; my_errno = rc;
goto error; goto error;
...@@ -420,7 +420,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share) ...@@ -420,7 +420,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share)
delete share->db2Table; delete share->db2Table;
db2Table = NULL; db2Table = NULL;
hash_delete(&ibmdb2i_open_tables, (uchar*) share); my_hash_delete(&ibmdb2i_open_tables, (uchar*) share);
thr_lock_delete(&share->lock); thr_lock_delete(&share->lock);
pthread_mutex_destroy(&share->mutex); pthread_mutex_destroy(&share->mutex);
my_free(share, MYF(0)); my_free(share, MYF(0));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment