summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2007-01-01 10:51:44 +0100
committerunknown <kent@mysql.com/kent-amd64.(none)>2007-01-01 10:51:44 +0100
commit0f09b9ce7fddc02138d019a36d4c1fc26f218f37 (patch)
tree2f91c3d337db37ac14712b7ee7f4d8c6eb8b06b6 /innobase/include
parent690404db2eb2d90b5286b5adc89533e8cea13f8a (diff)
parent19a33e08f2da6692e4f1e18b8b0b627df4ae5ac5 (diff)
downloadmariadb-git-0f09b9ce7fddc02138d019a36d4c1fc26f218f37.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/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/include')
-rw-r--r--innobase/include/hash0hash.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/include/hash0hash.h b/innobase/include/hash0hash.h
index 51315e40875..3abc05f174c 100644
--- a/innobase/include/hash0hash.h
+++ b/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 */