diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-01-11 12:43:30 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-01-11 12:43:30 +0100 |
| commit | b139c2875e70e8f4a42b5a80c0afe9a564324e06 (patch) | |
| tree | aeed4981c131e15fe65130811c58c4b011259dc1 /innobase/dict | |
| parent | bfca790262d4d7681c0605d3c6ae7856d0408b9c (diff) | |
| parent | a1566a0952a7a43ca173bf1b6f8c6aec50795d10 (diff) | |
| download | mariadb-git-b139c2875e70e8f4a42b5a80c0afe9a564324e06.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/ha/ha0ha.c:
Auto merged
innobase/include/hash0hash.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
Diffstat (limited to 'innobase/dict')
| -rw-r--r-- | innobase/dict/dict0dict.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index 4ceeb4cafc0..ba03e1f5e41 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -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; |