diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-22 10:19:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-22 10:19:31 +0100 |
| commit | a48a91d90f07798deebe514d9d827fb719da7294 (patch) | |
| tree | c438c045be1f3d8167b3746aa3ac87f848902aeb /storage/heap | |
| parent | 3a1fdc9e7fc65e29320b988f9a69c8acab168ff9 (diff) | |
| parent | 13ba0dd286f3296bfbbd202fa76d47770734b472 (diff) | |
| download | mariadb-git-a48a91d90f07798deebe514d9d827fb719da7294.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/hp_rkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |