diff options
| author | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
| commit | 859b68847666823baa328c5c7f3da96787807bb3 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /heap/hp_write.c | |
| parent | 564487d7c00098e8a37c8e675197414667685452 (diff) | |
| parent | 496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff) | |
| download | mariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz | |
Merge with 4.0.6
Diffstat (limited to 'heap/hp_write.c')
| -rw-r--r-- | heap/hp_write.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 87211d4c224..f92d8caa633 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -61,9 +61,13 @@ int heap_write(HP_INFO *info, const byte *record) info->current_ptr=pos; info->current_hash_ptr=0; info->update|=HA_STATE_AKTIV; +#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG) + DBUG_EXECUTE("check_heap",heap_check_heap(info, 0);); +#endif if (share->auto_key) heap_update_auto_increment(info, record); DBUG_RETURN(0); + err: DBUG_PRINT("info",("Duplicate key: %d", keydef - share->keydef)); info->errkey= keydef - share->keydef; @@ -83,6 +87,7 @@ err: *((byte**) pos)=share->del_link; share->del_link=pos; pos[share->reclength]=0; /* Record deleted */ + DBUG_RETURN(my_errno); } /* heap_write */ |