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<[email protected]> over IM.
mysql · May 29, 2018 · af43dc2 · af43dc2
1 parent a152d9f
commit af43dc2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
@@ -5214,7 +5214,7 @@ btr_cur_pessimistic_delete(
 	ulint		level;
 	mem_heap_t*	heap;
 	ulint*		offsets;
-	bool		allow_merge;/* if true, implies we have taken appropriate page
+	bool		allow_merge = true; /* if true, implies we have taken appropriate page
 			latches needed to merge this page.*/
 #ifdef UNIV_DEBUG
 	bool		parent_latched	= false;
@@ -5366,7 +5366,10 @@ btr_cur_pessimistic_delete(
 
 	btr_search_update_hash_on_delete(cursor);
 
-	if (page_is_leaf(page)) {
+	if (page_is_leaf(page) || dict_index_is_spatial(index)) {
+	/* Set allow merge to true for spatial indexes as the tree is X
+        locked incase of delete operation on spatial indexes thus avoiding
+        possibility of upward locking.*/
 		allow_merge = true;
 	} else {
 		allow_merge = btr_cur_will_modify_tree(index,page,BTR_INTENTION_DELETE,