Revert "[sql/gis] PS-9121 Innodb fails to update spatial index"

This reverts commit c7767c9.

Author: inikep

sql/gis/rtree_support.cc

@@ -144,14 +144,6 @@ bool mbr_equal_cmp(const dd::Spatial_reference_system *srs, rtr_mbr_t *a,
   return result;
 }
 
-bool mbr_equal_precise_cmp(rtr_mbr_t *mbr_a, rtr_mbr_t *mbr_b) {
-  assert(mbr_a->xmin <= mbr_a->xmax && mbr_a->ymin <= mbr_a->ymax);
-  assert(mbr_b->xmin <= mbr_b->xmax && mbr_b->ymin <= mbr_b->ymax);
-
-  return mbr_a->xmin == mbr_b->xmin && mbr_a->xmax == mbr_b->xmax &&
-         mbr_a->ymin == mbr_b->ymin && mbr_a->ymax == mbr_b->ymax;
-}
-
 bool mbr_intersect_cmp(const dd::Spatial_reference_system *srs, rtr_mbr_t *a,
                        rtr_mbr_t *b) {
   try {

sql/gis/rtree_support.h

@@ -92,18 +92,6 @@ bool mbr_contain_cmp(const dd::Spatial_reference_system *srs, rtr_mbr_t *a,
 bool mbr_equal_cmp(const dd::Spatial_reference_system *srs, rtr_mbr_t *a,
                    rtr_mbr_t *b);
 
-/// Checks if two MBRs are equal more precisely
-///
-/// For both MBRs, the coordinates of the MBR's minimum corners must be smaller
-/// than or equal to the corresponding coordinates of the maximum corner.
-///
-/// @param[in] mbr_a The first MBR.
-/// @param[in] mbr_b The second MBR.
-///
-/// @retval true The two MBRs are equal.
-/// @retval false The two MBRs aren't equal.
-bool mbr_equal_precise_cmp(rtr_mbr_t *mbr_a, rtr_mbr_t *mbr_b);
-
 /// Checks if two MBRs intersect each other
 ///
 /// @param[in] srs Spatial reference system.

storage/innobase/row/row0sel.cc

@@ -5705,7 +5705,7 @@ dberr_t row_search_mvcc(byte *buf, page_cur_mode_t mode,
                                       UT_LOCATION_HERE, &heap);
       rtr_get_mbr_from_rec(rec, index_offsets, &index_mbr);
 
-      if (mbr_equal_precise_cmp(&clust_mbr, &index_mbr)) {
+      if (mbr_equal_cmp(index->rtr_srs.get(), &clust_mbr, &index_mbr)) {
         *is_dup_rec = true;
       }
     }

storage/innobase/row/row0upd.cc

@@ -1580,7 +1580,7 @@ bool row_upd_changes_ord_field_binary_func(dict_index_t *index,
         mem_heap_free(temp_heap);
       }
 
-      if (!mbr_equal_precise_cmp(old_mbr, new_mbr)) {
+      if (!mbr_equal_cmp(index->rtr_srs.get(), old_mbr, new_mbr)) {
         return (true);
       } else {
         continue;