Many files:

  Renamed hash_create() not to clash with imap using embedded server (bug#13859)

9 files changed, 13 insertions, 13 deletions

diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
index 31a581d2ba8..704b8e0a5c7 100644
--- a/innobase/buf/buf0buf.c
+++ b/innobase/buf/buf0buf.c
@@ -621,7 +621,7 @@ buf_pool_init(
 		}
 	}
 
-	buf_pool->page_hash = hash_create(2 * max_size);
+	buf_pool->page_hash = hash0_create(2 * max_size);
 
 	buf_pool->n_pend_reads = 0;
 
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index 4b23ce047b2..5e55a44ce56 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -703,13 +703,13 @@ dict_init(void)
 	mutex_create(&(dict_sys->mutex));
 	mutex_set_level(&(dict_sys->mutex), SYNC_DICT);
 
-	dict_sys->table_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_TABLE_HASH *
 					UNIV_WORD_SIZE));
-	dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_TABLE_HASH *
 					UNIV_WORD_SIZE));
-	dict_sys->col_hash = hash_create(buf_pool_get_max_size() /
+	dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /
 					(DICT_POOL_PER_COL_HASH *
 					UNIV_WORD_SIZE));
 	dict_sys->size = 0;
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index b576e4f5a70..269c25833a4 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -1295,8 +1295,8 @@ fil_system_create(
 
 	mutex_set_level(&(system->mutex), SYNC_ANY_LATCH);
 
-	system->spaces = hash_create(hash_size);
-	system->name_hash = hash_create(hash_size);
+	system->spaces = hash0_create(hash_size);
+	system->name_hash = hash0_create(hash_size);
 
 	UT_LIST_INIT(system->LRU);
 
diff --git a/innobase/ha/ha0ha.c b/innobase/ha/ha0ha.c
index ad1391ff83e..a64fb13a5bb 100644
--- a/innobase/ha/ha0ha.c
+++ b/innobase/ha/ha0ha.c
@@ -32,7 +32,7 @@ ha_create(
 	hash_table_t*	table;
 	ulint		i;
 
-	table = hash_create(n);
+	table = hash0_create(n);
 
 	if (in_btr_search) {
 		table->adaptive = TRUE;
diff --git a/innobase/ha/hash0hash.c b/innobase/ha/hash0hash.c
index facdea66198..18b5b3cefd6 100644
--- a/innobase/ha/hash0hash.c
+++ b/innobase/ha/hash0hash.c
@@ -74,7 +74,7 @@ Creates a hash table with >= n array cells. The actual number of cells is
 chosen to be a prime number slightly bigger than n. */
 
 hash_table_t*
-hash_create(
+hash0_create(
 /*========*/
 			/* out, own: created table */
 	ulint	n)	/* in: number of array cells */
diff --git a/innobase/include/hash0hash.h b/innobase/include/hash0hash.h
index 51315e40875..3abc05f174c 100644
--- a/innobase/include/hash0hash.h
+++ b/innobase/include/hash0hash.h
@@ -23,7 +23,7 @@ Creates a hash table with >= n array cells. The actual number
 of cells is chosen to be a prime number slightly bigger than n. */
 
 hash_table_t*
-hash_create(
+hash0_create(
 /*========*/
 			/* out, own: created table */
 	ulint	n);	/* in: number of array cells */
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c
index 1c08d3defaa..19a285ed3f3 100644
--- a/innobase/lock/lock0lock.c
+++ b/innobase/lock/lock0lock.c
@@ -550,7 +550,7 @@ lock_sys_create(
 {
 	lock_sys = mem_alloc(sizeof(lock_sys_t));
 
-	lock_sys->rec_hash = hash_create(n_cells);
+	lock_sys->rec_hash = hash0_create(n_cells);
 
 	/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */
 
diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c
index ddb33de6fa6..37d9f5883b2 100644
--- a/innobase/log/log0recv.c
+++ b/innobase/log/log0recv.c
@@ -147,7 +147,7 @@ recv_sys_init(
 	recv_sys->len = 0;
 	recv_sys->recovered_offset = 0;
 
-	recv_sys->addr_hash = hash_create(available_memory / 64);
+	recv_sys->addr_hash = hash0_create(available_memory / 64);
 	recv_sys->n_addrs = 0;
 	
 	recv_sys->apply_log_recs = FALSE;
@@ -186,7 +186,7 @@ recv_sys_empty_hash(void)
 	hash_table_free(recv_sys->addr_hash);
 	mem_heap_empty(recv_sys->heap);
 
-	recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
+	recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
 }
 
 /************************************************************
diff --git a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c
index 033bb22807f..f71048af2ba 100644
--- a/innobase/thr/thr0loc.c
+++ b/innobase/thr/thr0loc.c
@@ -224,7 +224,7 @@ thr_local_init(void)
 
 	ut_a(thr_local_hash == NULL);
 
-	thr_local_hash = hash_create(OS_THREAD_MAX_N + 100);
+	thr_local_hash = hash0_create(OS_THREAD_MAX_N + 100);
 
 	mutex_create(&thr_local_mutex);
 	mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL);