diff options
| author | Monty <monty@mariadb.org> | 2015-10-23 18:44:13 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-11-10 13:46:56 +0200 |
| commit | 7cd2095cde11af4ac0478c5ff9a221a832e23586 (patch) | |
| tree | 39b74a8441bfae11037e11b70493a36fd06a4ea4 /storage/heap/hp_hash.c | |
| parent | 7ec655850397a0edfcea8c1fd82650824297e564 (diff) | |
| download | mariadb-git-7cd2095cde11af4ac0478c5ff9a221a832e23586.tar.gz | |
Sage cleanup in heap storage engine
Removed old not needed code withing #if
Changed 0x%lx to %p
Diffstat (limited to 'storage/heap/hp_hash.c')
| -rw-r--r-- | storage/heap/hp_hash.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c index aba7e8383da..b727c71d3de 100644 --- a/storage/heap/hp_hash.c +++ b/storage/heap/hp_hash.c @@ -19,8 +19,6 @@ #include "heapdef.h" #include <m_ctype.h> - - /* Find out how many rows there is in the given range @@ -120,7 +118,7 @@ uchar *hp_search(HP_INFO *info, HP_KEYDEF *keyinfo, const uchar *key, { switch (nextflag) { case 0: /* Search after key */ - DBUG_PRINT("exit", ("found key at 0x%lx", (long) pos->ptr_to_rec)); + DBUG_PRINT("exit", ("found key at %p", pos->ptr_to_rec)); info->current_hash_ptr=pos; DBUG_RETURN(info->current_ptr= pos->ptr_to_rec); case 1: /* Search next */ @@ -878,17 +876,8 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, /* Convert NULL from MySQL representation into HEAP's. */ if (!(*key++= (char) 1 - *old++)) { -#if 0 - /* - Skip length part of a variable length field. - Length of key-part used with heap_rkey() always 2. - See also hp_hashnr(). - */ - if (seg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART)) -#else /* Add key pack length (2) to key for VARCHAR segments */ if (seg->type == HA_KEYTYPE_VARTEXT1) -#endif old+= 2; continue; } |