diff options
| author | unknown <timour@askmonty.org> | 2012-11-01 21:36:31 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-01 21:36:31 +0200 |
| commit | a1108a0b6c098c7bae8b12d31b6338d563a318c1 (patch) | |
| tree | cb513a6dca8a0d7dfa14b4d13e930788139280a7 /storage/heap | |
| parent | 9b6fe965033aab5eb20a4f2eefa482534b15c424 (diff) | |
| parent | 8b5d345eea3b4df053a1cdbff398d270af9547ad (diff) | |
| download | mariadb-git-a1108a0b6c098c7bae8b12d31b6338d563a318c1.tar.gz | |
Merge 5.2 -> 5.3
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 166ed28aed0..2720e0d0543 100644 --- a/storage/heap/hp_rkey.c +++ b/storage/heap/hp_rkey.c @@ -64,7 +64,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); |