Skip to content

Commit 3e38cf4

Browse files
Aakanksha Vermagipulla
authored andcommitted
BUG#26225783 MYSQL CRASH ON CREATE TABLE (REPRODUCEABLE) -> INNODB: A
LONG SEMAPHORE WAIT Post Push fix for test case failure innodb_gis.rtree_rollback1 on weekly-5.7. Reviewed by : Debarun Banerjee<debarun.banerjee@oracle.com> over IM. (cherry picked from commit ec6f970e5f1cdf1ea03586f2f30e3f71b133d412)
1 parent 4aa63f9 commit 3e38cf4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

storage/innobase/btr/btr0cur.cc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5214,7 +5214,7 @@ btr_cur_pessimistic_delete(
52145214
ulint level;
52155215
mem_heap_t* heap;
52165216
ulint* offsets;
5217-
boolallow_merge;/* if true, implies we have taken appropriate page
5217+
boolallow_merge = true; /* if true, implies we have taken appropriate page
52185218
latches needed to merge this page.*/
52195219
#ifdef UNIV_DEBUG
52205220
boolparent_latched = false;
@@ -5366,7 +5366,10 @@ btr_cur_pessimistic_delete(
53665366

53675367
btr_search_update_hash_on_delete(cursor);
53685368

5369-
if (page_is_leaf(page)) {
5369+
if (page_is_leaf(page) || dict_index_is_spatial(index)) {
5370+
/* Set allow merge to true for spatial indexes as the tree is X
5371+
locked incase of delete operation on spatial indexes thus avoiding
5372+
possibility of upward locking.*/
53705373
allow_merge = true;
53715374
} else {
53725375
allow_merge = btr_cur_will_modify_tree(index,page,BTR_INTENTION_DELETE,

0 commit comments

Comments
 (0)