mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build

Browse source 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
This commit is contained in:
kent@mysql.com/kent-amd64.(none) 2007-01-11 12:43:30 +01:00
commit e9f9b03263
9 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
innobase/buf/buf0buf.c
View file

@ -649,7 +649,7 @@ buf_pool_init(
}
}
buf_pool->page_hash = hash0_create(2 * max_size);
buf_pool->page_hash = hash_create(2 * max_size);
buf_pool->n_pend_reads = 0;

6
innobase/dict/dict0dict.c
View file

@ -708,13 +708,13 @@ dict_init(void)
mutex_create(&(dict_sys->mutex));
mutex_set_level(&(dict_sys->mutex), SYNC_DICT);
dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /
dict_sys->table_hash = hash_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /
dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /
(DICT_POOL_PER_TABLE_HASH *
UNIV_WORD_SIZE));
dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /
dict_sys->col_hash = hash_create(buf_pool_get_max_size() /
(DICT_POOL_PER_COL_HASH *
UNIV_WORD_SIZE));
dict_sys->size = 0;

4
innobase/fil/fil0fil.c
View file

@ -1294,8 +1294,8 @@ fil_system_create(
mutex_set_level(&(system->mutex), SYNC_ANY_LATCH);
system->spaces = hash0_create(hash_size);
system->name_hash = hash0_create(hash_size);
system->spaces = hash_create(hash_size);
system->name_hash = hash_create(hash_size);
UT_LIST_INIT(system->LRU);

2
innobase/ha/ha0ha.c
View file

@ -32,7 +32,7 @@ ha_create(
hash_table_t* table;
ulint i;
table = hash0_create(n);
table = hash_create(n);
if (in_btr_search) {
table->adaptive = TRUE;

2
innobase/ha/hash0hash.c
View file

@ -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*
hash0_create(
hash_create(
/*========*/
/* out, own: created table */
ulint n) /* in: number of array cells */

5
innobase/include/hash0hash.h
View file

@ -18,12 +18,15 @@ typedef struct hash_cell_struct hash_cell_t;
typedef void* hash_node_t;
/* Fix Bug #13859: symbol collision between imap/mysql */
#define hash_create hash0_create
/*****************************************************************
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*
hash0_create(
hash_create(
/*========*/
/* out, own: created table */
ulint n); /* in: number of array cells */

2
innobase/lock/lock0lock.c
View file

@ -584,7 +584,7 @@ lock_sys_create(
{
lock_sys = mem_alloc(sizeof(lock_sys_t));
lock_sys->rec_hash = hash0_create(n_cells);
lock_sys->rec_hash = hash_create(n_cells);
/* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */

4
innobase/log/log0recv.c
View file

@ -148,7 +148,7 @@ recv_sys_init(
recv_sys->len = 0;
recv_sys->recovered_offset = 0;
recv_sys->addr_hash = hash0_create(available_memory / 64);
recv_sys->addr_hash = hash_create(available_memory / 64);
recv_sys->n_addrs = 0;
recv_sys->apply_log_recs = FALSE;
@ -187,7 +187,7 @@ recv_sys_empty_hash(void)
hash_table_free(recv_sys->addr_hash);
mem_heap_empty(recv_sys->heap);
recv_sys->addr_hash = hash0_create(buf_pool_get_curr_size() / 256);
recv_sys->addr_hash = hash_create(buf_pool_get_curr_size() / 256);
}
/************************************************************

2
innobase/thr/thr0loc.c
View file

@ -224,7 +224,7 @@ thr_local_init(void)
ut_a(thr_local_hash == NULL);
thr_local_hash = hash0_create(OS_THREAD_MAX_N + 100);
thr_local_hash = hash_create(OS_THREAD_MAX_N + 100);
mutex_create(&thr_local_mutex);
mutex_set_level(&thr_local_mutex, SYNC_THR_LOCAL);