summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 2698b29d787..3ad7bea5661 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -186,9 +186,9 @@ bool my_dboptions_cache_init(void)
if (!dboptions_init)
{
dboptions_init= 1;
- error= my_hash_init(&dboptions, table_alias_charset,
- 32, 0, 0, (my_hash_get_key) dboptions_get_key,
- free_dbopt, 0, key_memory_dboptions_hash);
+ error= my_hash_init(key_memory_dboptions_hash, &dboptions,
+ table_alias_charset, 32, 0, 0, (my_hash_get_key)
+ dboptions_get_key, free_dbopt, 0);
}
return error;
}
@@ -218,9 +218,8 @@ void my_dbopt_cleanup(void)
{
mysql_rwlock_wrlock(&LOCK_dboptions);
my_hash_free(&dboptions);
- my_hash_init(&dboptions, table_alias_charset,
- 32, 0, 0, (my_hash_get_key) dboptions_get_key,
- free_dbopt, 0, key_memory_dboptions_hash);
+ my_hash_init(key_memory_dboptions_hash, &dboptions, table_alias_charset, 32,
+ 0, 0, (my_hash_get_key) dboptions_get_key, free_dbopt, 0);
mysql_rwlock_unlock(&LOCK_dboptions);
}