Fixed bug#22698076 INNODB: FAILING ASSERTION:

  !(REC_GET_INFO_BITS(REC2, COMP) & 0X10UL)

1:We need to remove some code of checking if pk fields changed in
  rtr_merge_mbr_changed.
  Since we've removed pk fields of internal node of R-Tree in wl#7740, we
  just need to check MBR field is changed or not only. We don't need to
  check other fields anymore.

2:And a wrong rec order issue is caused by the internal recs order is not
  same as the page order, and if page merge to its right page when R-Tree
  is shrinking, it'll cause wrong recs order.

Reviewed-by Jimmy Yang<jimmy.yang@eracle.com>
RB: 12089

Author: Allen Lai

storage/innobase/btr/btr0btr.cc

@@ -3631,6 +3631,8 @@ btr_compress(
 		/* For rtree, we need to update father's mbr. */
 		if (dict_index_is_spatial(index)) {
 			ulint*	offsets2;
+			ulint	rec_info;
+
 			offsets2 = rec_get_offsets(
 				btr_cur_get_rec(&cursor2),
 				index, NULL, ULINT_UNDEFINED, &heap);
@@ -3639,11 +3641,31 @@ btr_compress(
 				btr_cur_get_rec(&cursor2), offsets2)
 				== right_page_no);
 
-			rtr_merge_and_update_mbr(&father_cursor,
-						 &cursor2,
-						 offsets, offsets2,
-						 merge_page, merge_block,
-						 block, index, mtr);
+			rec_info = rec_get_info_bits(
+				btr_cur_get_rec(&father_cursor),
+				rec_offs_comp(offsets));
+			if (rec_info & REC_INFO_MIN_REC_FLAG) {
+				/* When the father node ptr is minimal rec,
+				we will keep it and delete the node ptr of
+				merge page. */
+				rtr_merge_and_update_mbr(&father_cursor,
+							 &cursor2,
+							 offsets, offsets2,
+							 merge_page,
+							 merge_block,
+							 block, index, mtr);
+			} else {
+				/* Otherwise, we will keep the node ptr of
+				merge page and delete the father node ptr.
+				This is for keeping the rec order in upper
+				level. */
+				rtr_merge_and_update_mbr(&cursor2,
+							 &father_cursor,
+							 offsets2, offsets,
+							 merge_page,
+							 merge_block,
+							 block, index, mtr);
+			}
 			lock_mutex_enter();
 			lock_rec_free_all_from_discard_page(block);
 			lock_mutex_exit();

storage/innobase/gis/gis0rtree.cc

@@ -1687,36 +1687,6 @@ rtr_merge_mbr_changed(
 		mbr++;
 	}
 
-	if (!changed) {
-		rec_t*	rec1;
-		rec_t*	rec2;
-		ulint*	offsets1;
-		ulint*	offsets2;
-		mem_heap_t*	heap;
-
-		heap = mem_heap_create(100);
-
-		rec1 = page_rec_get_next(
-			page_get_infimum_rec(
-				buf_block_get_frame(merge_block)));
-
-		offsets1 = rec_get_offsets(
-			rec1, index, NULL, ULINT_UNDEFINED, &heap);
-
-		rec2 = page_rec_get_next(
-			page_get_infimum_rec(
-				buf_block_get_frame(block)));
-		offsets2 = rec_get_offsets(
-			rec2, index, NULL, ULINT_UNDEFINED, &heap);
-
-		/* Check any primary key fields have been changed */
-		if (cmp_rec_rec(rec1, rec2, offsets1, offsets2, index) != 0) {
-			changed = true;
-		}
-
-		mem_heap_free(heap);
-	}
-
 	return(changed);
 }