diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 21:33:01 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-30 21:33:01 +0100 |
| commit | 36f67a7dff9087236e3c8b99452702b638fd020e (patch) | |
| tree | 70835feb15dd56efaab13257ecf721f77c9295a5 /storage/heap | |
| parent | cd1c10859d77d967aec8590fa9de4d17ed480dbf (diff) | |
| parent | c8ba98206f1b08bf02c6a6f993b8e1b6842cb665 (diff) | |
| download | mariadb-git-36f67a7dff9087236e3c8b99452702b638fd020e.tar.gz | |
Merge branch '10.1' into 10.2
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 f57e505134f..51e47ea2271 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); |