diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 16:49:19 -0800 |
| commit | 7760efad74140680b1eefaf2172b0fa26f7b1146 (patch) | |
| tree | 57742baa180206a1cd3ea35d38c58108accd22a9 /storage/heap | |
| parent | 40bbf697aad7d923fc1bd995bc5f547e45461cbe (diff) | |
| parent | b8b875cb796743240bed71857eae73d37f03c28f (diff) | |
| download | mariadb-git-7760efad74140680b1eefaf2172b0fa26f7b1146.tar.gz | |
Merge mariadb-5.5 -> 10.0-base.
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | storage/heap/hp_rkey.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt index 0b9372bf224..3a0c2e7271c 100644 --- a/storage/heap/CMakeLists.txt +++ b/storage/heap/CMakeLists.txt @@ -21,8 +21,10 @@ SET(HEAP_SOURCES _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED) -ADD_EXECUTABLE(hp_test1 hp_test1.c) -TARGET_LINK_LIBRARIES(hp_test1 heap mysys dbug strings) +IF(WITH_UNIT_TESTS) + ADD_EXECUTABLE(hp_test1 hp_test1.c) + TARGET_LINK_LIBRARIES(hp_test1 heap mysys dbug strings) -ADD_EXECUTABLE(hp_test2 hp_test2.c) -TARGET_LINK_LIBRARIES(hp_test2 heap mysys dbug strings) + ADD_EXECUTABLE(hp_test2 hp_test2.c) + TARGET_LINK_LIBRARIES(hp_test2 heap mysys dbug strings) +ENDIF()
\ No newline at end of file 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); |