diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-03-24 18:21:22 +0100 |
| commit | 335de5db1834d3aeac507f18fcd5143c22150500 (patch) | |
| tree | 95ac83922a28c81982c9ad89fcaba6c040b5111b /storage/heap/hp_hash.c | |
| parent | b34cfe9327f2dcedb6bebfacdc2e757b6285426d (diff) | |
| parent | f72e0e686b2f3688fe98685107a293de5012be03 (diff) | |
| download | mariadb-git-335de5db1834d3aeac507f18fcd5143c22150500.tar.gz | |
Merge mariadb 5.3->mariadb 5.5
Diffstat (limited to 'storage/heap/hp_hash.c')
| -rw-r--r-- | storage/heap/hp_hash.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c index e916224c4d5..d44726ba762 100644 --- a/storage/heap/hp_hash.c +++ b/storage/heap/hp_hash.c @@ -148,8 +148,8 @@ uchar *hp_search(HP_INFO *info, HP_KEYDEF *keyinfo, const uchar *key, { flag=0; /* Reset flag */ if (hp_find_hash(&keyinfo->block, - hp_mask(hp_rec_hashnr(keyinfo, pos->ptr_to_rec), - share->blength, share->records)) != pos) + hp_mask(pos->hash_of_key, + share->blength, share->records)) != pos) break; /* Wrong link */ } } @@ -299,7 +299,9 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const uchar *key) } } } +#ifdef ONLY_FOR_HASH_DEBUGGING DBUG_PRINT("exit", ("hash: 0x%lx", nr)); +#endif return((ulong) nr); } @@ -366,7 +368,9 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const uchar *rec) } } } +#ifdef ONLY_FOR_HASH_DEBUGGING DBUG_PRINT("exit", ("hash: 0x%lx", nr)); +#endif return(nr); } @@ -437,7 +441,9 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const uchar *key) } } } +#ifdef ONLY_FOR_HASH_DEBUGGING DBUG_PRINT("exit", ("hash: 0x%lx", nr)); +#endif return(nr); } @@ -490,7 +496,9 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const uchar *rec) } } } +#ifdef ONLY_FOR_HASH_DEBUGGING DBUG_PRINT("exit", ("hash: 0x%lx", nr)); +#endif return(nr); } |