diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-12-18 15:01:58 +0100 |
| commit | 701419b02f12688188a7d4183523e0f5ee9ae09a (patch) | |
| tree | 9cad9901bbf188c5ab30aeb31f10c71f61921312 /storage/heap | |
| parent | 4923d19b7c3c4c034f70ac1411837afa75c4b6ad (diff) | |
| parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
| download | mariadb-git-701419b02f12688188a7d4183523e0f5ee9ae09a.tar.gz | |
Merge MariaDB 10.0-base to MariaDB 10.0
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.h | 5 | ||||
| -rw-r--r-- | storage/heap/hp_rkey.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h index c5b8a09b216..30ad06e2c06 100644 --- a/storage/heap/ha_heap.h +++ b/storage/heap/ha_heap.h @@ -38,11 +38,6 @@ public: ha_heap(handlerton *hton, TABLE_SHARE *table); ~ha_heap() {} handler *clone(const char *name, MEM_ROOT *mem_root); - const char *table_type() const - { - return (table->in_use->variables.sql_mode & MODE_MYSQL323) ? - "HEAP" : "MEMORY"; - } const char *index_type(uint inx) { return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ? diff --git a/storage/heap/hp_rkey.c b/storage/heap/hp_rkey.c index d0cbb94eb0e..138d65f9d25 100644 --- a/storage/heap/hp_rkey.c +++ b/storage/heap/hp_rkey.c @@ -65,7 +65,7 @@ int heap_rkey(HP_INFO *info, uchar *record, int inx, const uchar *key, info->update= HA_STATE_NO_KEY; DBUG_RETURN(my_errno); } - if (!(keyinfo->flag & HA_NOSAME)) + if ((keyinfo->flag & (HA_NOSAME | HA_NULL_PART_KEY)) != HA_NOSAME) memcpy(info->lastkey, key, (size_t) keyinfo->length); } memcpy(record, pos, (size_t) share->reclength); |