summaryrefslogtreecommitdiff
path: root/innobase/buf
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2007-01-11 12:43:30 +0100
committerunknown <kent@mysql.com/kent-amd64.(none)>2007-01-11 12:43:30 +0100
commitb139c2875e70e8f4a42b5a80c0afe9a564324e06 (patch)
treeaeed4981c131e15fe65130811c58c4b011259dc1 /innobase/buf
parentbfca790262d4d7681c0605d3c6ae7856d0408b9c (diff)
parenta1566a0952a7a43ca173bf1b6f8c6aec50795d10 (diff)
downloadmariadb-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/buf')
-rw-r--r--innobase/buf/buf0buf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
index ff7622aca81..f24f1744363 100644
--- a/innobase/buf/buf0buf.c
+++ b/innobase/buf/buf0buf.c
@@ -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;