diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 14:47:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 14:47:35 +0100 |
| commit | d671f506b0e67b951be60d61236ca8a44953d407 (patch) | |
| tree | 0d8068a11ac9541ab3889ea7fd0cec8299e6bd99 /storage/heap | |
| parent | 708d46158b7f20b702734990cc63f08abaf27443 (diff) | |
| parent | 9277b6ec1ce8bc195a10b5deb11d65843adf8972 (diff) | |
| download | mariadb-git-d671f506b0e67b951be60d61236ca8a44953d407.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 4 | ||||
| -rw-r--r-- | storage/heap/hp_close.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 35a0dd108e6..102293fc801 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -431,6 +431,10 @@ int ha_heap::reset_auto_increment(ulonglong value) int ha_heap::external_lock(THD *thd, int lock_type) { +#ifndef DBUG_OFF + if (lock_type == F_UNLCK && file->s->changed && heap_check_heap(file, 0)) + return HA_ERR_CRASHED; +#endif return 0; // No external locking } diff --git a/storage/heap/hp_close.c b/storage/heap/hp_close.c index 092048a7c1c..82d6186340a 100644 --- a/storage/heap/hp_close.c +++ b/storage/heap/hp_close.c @@ -35,12 +35,6 @@ int hp_close(register HP_INFO *info) { int error=0; DBUG_ENTER("hp_close"); -#ifndef DBUG_OFF - if (info->s->changed && heap_check_heap(info,0)) - { - error=my_errno=HA_ERR_CRASHED; - } -#endif info->s->changed=0; if (info->open_list.data) heap_open_list=list_delete(heap_open_list,&info->open_list); |