diff options
author | unknown <kent@kent-amd64.(none)> | 2007-01-01 10:54:14 +0100 |
---|---|---|
committer | unknown <kent@kent-amd64.(none)> | 2007-01-01 10:54:14 +0100 |
commit | c16b3782edd0337d45bbe503f0ed874df028a715 (patch) | |
tree | 455ef16da7319aeb19aa047336ff945ebb12e2eb /storage/innobase/buf | |
parent | cf02f67854bc151c2c9fb15280cb242519340ad0 (diff) | |
parent | 0f09b9ce7fddc02138d019a36d4c1fc26f218f37 (diff) | |
download | mariadb-git-c16b3782edd0337d45bbe503f0ed874df028a715.tar.gz |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ha/ha0ha.c:
Auto merged
storage/innobase/ha/hash0hash.c:
Auto merged
storage/innobase/include/hash0hash.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/thr/thr0loc.c:
Auto merged
Diffstat (limited to 'storage/innobase/buf')
-rw-r--r-- | storage/innobase/buf/buf0buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index 99e365d6129..ab0aa1d94d9 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/buf/buf0buf.c @@ -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; |