diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
| commit | f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf (patch) | |
| tree | 88134dff388f88041cd557eb53bc262667f51f96 /storage/heap | |
| parent | bf5c050fd28f616d789a02b0fbd6fd8ff53c78d3 (diff) | |
| parent | b8d38c5e39d526e006f4e8e8977ac4c6166bc4c6 (diff) | |
| download | mariadb-git-f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index dde67e3c11a..5f7f0c1efa0 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -427,7 +427,7 @@ int ha_heap::reset_auto_increment(ulonglong value) int ha_heap::external_lock(THD *thd, int lock_type) { -#ifndef DBUG_OFF +#if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) if (lock_type == F_UNLCK && file->s->changed && heap_check_heap(file, 0)) return HA_ERR_CRASHED; #endif |