database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Browse Source 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
This commit is contained in:
kent@kent-amd64.(none)
2007-01-01 10:54:14 +01:00
parent 7e94389684 769e177090
commit c92b3b9b6a
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/buf/buf0buf.c
View File

@@ -704,7 +704,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; buf_pool->n_pend_reads = 0;

4
storage/innobase/dict/dict0dict.c
View File

@@ -782,10 +782,10 @@ dict_init(void)
mutex_create(&dict_sys->mutex, SYNC_DICT); mutex_create(&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 / (DICT_POOL_PER_TABLE_HASH
* UNIV_WORD_SIZE)); * 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 / (DICT_POOL_PER_TABLE_HASH
* UNIV_WORD_SIZE)); * UNIV_WORD_SIZE));
dict_sys->size = 0; dict_sys->size = 0;

4
storage/innobase/fil/fil0fil.c
View File

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

2
storage/innobase/ha/ha0ha.c
View File

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

2
storage/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. */ chosen to be a prime number slightly bigger than n. */
hash_table_t* hash_table_t*
hash_create( hash0_create(
/*========*/ /*========*/
/* out, own: created table */ /* out, own: created table */
ulint n) /* in: number of array cells */ ulint n) /* in: number of array cells */

2
storage/innobase/include/hash0hash.h
View File

@@ -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. */ of cells is chosen to be a prime number slightly bigger than n. */
hash_table_t* hash_table_t*
hash_create( hash0_create(
/*========*/ /*========*/
/* out, own: created table */ /* out, own: created table */
ulint n); /* in: number of array cells */ ulint n); /* in: number of array cells */

2
storage/innobase/lock/lock0lock.c
View File

@@ -586,7 +586,7 @@ lock_sys_create(
{ {
lock_sys = mem_alloc(sizeof(lock_sys_t)); 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); */ /* hash_create_mutexes(lock_sys->rec_hash, 2, SYNC_REC_LOCK); */

4
storage/innobase/log/log0recv.c
View File

@@ -146,7 +146,7 @@ recv_sys_init(
recv_sys->len = 0; recv_sys->len = 0;
recv_sys->recovered_offset = 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->n_addrs = 0;
recv_sys->apply_log_recs = FALSE; recv_sys->apply_log_recs = FALSE;
@@ -187,7 +187,7 @@ recv_sys_empty_hash(void)
hash_table_free(recv_sys->addr_hash); hash_table_free(recv_sys->addr_hash);
mem_heap_empty(recv_sys->heap); 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);
} }
/************************************************************ /************************************************************

2
storage/innobase/thr/thr0loc.c
View File

@@ -224,7 +224,7 @@ thr_local_init(void)
ut_a(thr_local_hash == NULL); 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, SYNC_THR_LOCAL); mutex_create(&thr_local_mutex, SYNC_THR_LOCAL);
} }