summaryrefslogtreecommitdiff
path: root/storage/innobase/include
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-01-01 10:54:14 +0100
committerunknown <kent@kent-amd64.(none)>2007-01-01 10:54:14 +0100
commitc16b3782edd0337d45bbe503f0ed874df028a715 (patch)
tree455ef16da7319aeb19aa047336ff945ebb12e2eb /storage/innobase/include
parentcf02f67854bc151c2c9fb15280cb242519340ad0 (diff)
parent0f09b9ce7fddc02138d019a36d4c1fc26f218f37 (diff)
downloadmariadb-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/include')
-rw-r--r--storage/innobase/include/hash0hash.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index 31c5c57ae35..3685dbb1d82 100644
--- a/storage/innobase/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
@@ -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. */
hash_table_t*
-hash_create(
+hash0_create(
/*========*/
/* out, own: created table */
ulint n); /* in: number of array cells */