summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-04-28 10:18:30 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2023-04-28 10:18:30 +0300
commit8d26537fbf20d249d65d4daba0394a8ff71e540e (patch)
tree22dac69ee1db67378385c26e6f889ff59a2acd11 /storage/innobase
parent6abafdbb7cb79aec4dda159f177948e1ea77b7aa (diff)
downloadmariadb-git-8d26537fbf20d249d65d4daba0394a8ff71e540e.tar.gz
MDEV-30895 Assertion btr_cur->rtr_info->thr... in rtr_ins_enlarge_mbr()
rtr_ins_enlarge_mbr(): Relax the assertion that was added in commit f27e9c894779a4c7ebe6446ba9aa408f1771c114 to cover also table-rebuilding DDL. We only need btr_cur->rtr_info->thr for acquiring R-tree locks, and the thread that is executing a DDL operation has exclusive access to the being-built index or the copy of the being-rebuilt table.
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/gis/gis0rtree.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
index 60218a132c9..f75eab07cf3 100644
--- a/storage/innobase/gis/gis0rtree.cc
+++ b/storage/innobase/gis/gis0rtree.cc
@@ -1468,7 +1468,8 @@ rtr_ins_enlarge_mbr(
/* Check path info is not empty. */
ut_ad(!btr_cur->rtr_info->parent_path->empty());
- ut_ad(btr_cur->rtr_info->thr || !btr_cur->index()->is_committed());
+ ut_ad(btr_cur->rtr_info->thr || !btr_cur->index()->is_committed()
+ || btr_cur->index()->table->name.is_temporary());
/* Create a memory heap. */
heap = mem_heap_create(1024);