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/ha | |
| 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/ha')
| -rw-r--r-- | storage/innobase/ha/ha0ha.c | 2 | ||||
| -rw-r--r-- | storage/innobase/ha/hash0hash.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c index 23ea2554f01..aa2f86d2869 100644 --- a/storage/innobase/ha/ha0ha.c +++ b/storage/innobase/ha/ha0ha.c @@ -32,7 +32,7 @@ ha_create( hash_table_t* table; ulint i; - table = hash_create(n); + table = hash0_create(n); if (in_btr_search) { table->adaptive = TRUE; diff --git a/storage/innobase/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c index 6084a19fa27..1e5078d1d92 100644 --- a/storage/innobase/ha/hash0hash.c +++ b/storage/innobase/ha/hash0hash.c @@ -74,7 +74,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 */ |