diff options
| author | kroki/tomash@moonlight.home <> | 2007-01-09 12:44:16 +0300 |
|---|---|---|
| committer | kroki/tomash@moonlight.home <> | 2007-01-09 12:44:16 +0300 |
| commit | 7bf893f5519ac2facd0f089af38725f7516e7499 (patch) | |
| tree | b46c11522c0c2885e731c2f13b7b8f2fa4149a08 /storage/heap | |
| parent | 564309e416af895751577aa2f33dd5c9f3d61cfd (diff) | |
| parent | 1eb5b28fb765c7248ea68ab1191d410724abe9df (diff) | |
| download | mariadb-git-7bf893f5519ac2facd0f089af38725f7516e7499.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/hp_block.c | 2 | ||||
| -rw-r--r-- | storage/heap/hp_write.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/storage/heap/hp_block.c b/storage/heap/hp_block.c index 35e65a94603..85219380287 100644 --- a/storage/heap/hp_block.c +++ b/storage/heap/hp_block.c @@ -75,7 +75,7 @@ int hp_get_new_block(HP_BLOCK *block, ulong *alloc_length) and my_default_record_cache_size we get about 1/128 unused memory. */ *alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer; - if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(0)))) + if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME)))) return 1; if (i == 0) diff --git a/storage/heap/hp_write.c b/storage/heap/hp_write.c index f8b268ee06a..fd51b6f00c2 100644 --- a/storage/heap/hp_write.c +++ b/storage/heap/hp_write.c @@ -67,11 +67,17 @@ int heap_write(HP_INFO *info, const byte *record) DBUG_RETURN(0); err: - DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef))); + if (my_errno == HA_ERR_FOUND_DUPP_KEY) + DBUG_PRINT("info",("Duplicate key: %d", (int) keydef - share->keydef)); info->errkey= keydef - share->keydef; - if (keydef->algorithm == HA_KEY_ALG_BTREE) + /* + We don't need to delete non-inserted key from rb-tree. Also, if + we got ENOMEM, the key wasn't inserted, so don't try to delete it + either. Otherwise for HASH index on HA_ERR_FOUND_DUPP_KEY the key + was inserted and we have to delete it. + */ + if (keydef->algorithm == HA_KEY_ALG_BTREE || my_errno == ENOMEM) { - /* we don't need to delete non-inserted key from rb-tree */ keydef--; } while (keydef >= share->keydef) |