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/ha_heap.cc | |
| parent | cd1c10859d77d967aec8590fa9de4d17ed480dbf (diff) | |
| parent | c8ba98206f1b08bf02c6a6f993b8e1b6842cb665 (diff) | |
| download | mariadb-git-36f67a7dff9087236e3c8b99452702b638fd020e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/heap/ha_heap.cc')
| -rw-r--r-- | storage/heap/ha_heap.cc | 4 |
1 files changed, 4 insertions, 0 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 } |