diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-14 20:37:38 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-14 20:37:38 +0400 |
| commit | 9b41c7532d18b04d2f430932ad916886c77fbff6 (patch) | |
| tree | f4b1025df0074aacaf5f04f64aac370a80806ee1 /storage/archive | |
| parent | 2b75d952e68375eb1727040074266bbe1b436653 (diff) | |
| download | mariadb-git-9b41c7532d18b04d2f430932ad916886c77fbff6.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2617.22.5
committer: Konstantin Osipov <kostja@sun.com>
branch nick: mysql-6.0-runtime
timestamp: Tue 2009-01-27 05:08:48 +0300
message:
Remove non-prefixed use of HASH.
Always use my_hash_init(), my_hash_inited(), my_hash_search(),
my_hash_element(), my_hash_delete(), my_hash_free() rather
than non-prefixed counterparts (hash_init(), etc).
Remove the backward-compatible defines.
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index cfa5a721a97..4b4b2620d34 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -172,8 +172,8 @@ int archive_db_init(void *p) if (pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST)) goto error; - if (hash_init(&archive_open_tables, table_alias_charset, 32, 0, 0, - (hash_get_key) archive_get_key, 0, 0)) + if (my_hash_init(&archive_open_tables, table_alias_charset, 32, 0, 0, + (my_hash_get_key) archive_get_key, 0, 0)) { VOID(pthread_mutex_destroy(&archive_mutex)); } @@ -198,7 +198,7 @@ error: int archive_db_done(void *p) { - hash_free(&archive_open_tables); + my_hash_free(&archive_open_tables); VOID(pthread_mutex_destroy(&archive_mutex)); return 0; @@ -316,9 +316,9 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name, int *rc) pthread_mutex_lock(&archive_mutex); length=(uint) strlen(table_name); - if (!(share=(ARCHIVE_SHARE*) hash_search(&archive_open_tables, - (uchar*) table_name, - length))) + if (!(share=(ARCHIVE_SHARE*) my_hash_search(&archive_open_tables, + (uchar*) table_name, + length))) { char *tmp_name; azio_stream archive_tmp; @@ -394,7 +394,7 @@ int ha_archive::free_share() pthread_mutex_lock(&archive_mutex); if (!--share->use_count) { - hash_delete(&archive_open_tables, (uchar*) share); + my_hash_delete(&archive_open_tables, (uchar*) share); thr_lock_delete(&share->lock); VOID(pthread_mutex_destroy(&share->mutex)); /* |