Bug#21067378 GEOMETRIC OPERATION RETURNS ERROR INSTEAD OF RESULT

Problem: A query on a geometry column will return an error instead of
a result if there exists a UNIQUE index on the column.

The range optimizer temporarily transforms geometry columns of
specific subtypes to generic geometry columns while using the field
for type transformation. This only happens if the column is of type
MYSQL_TYPE_GEOMETRY and key_part->image_type is Field::itMBR. However,
when there's a spatial index on the column, key_part->image_type is
Field::itRAW, and the column type is not changed to the geometry
supertype. When a value is inserted that doesn't match the subtype, an
error is flagged and the query is aborted.

When the error is avoided, the result is still wrong since the
predicate is not recognized as a spatial operator.

Fix: Temporarily change all geometry columns to the geometry
supertype, regardless of image_type. Add COVERS and COVEREDBY to the
list in is_spatial_operator().

Author: nryeng

mysql-test/r/gis.result

@@ -2212,3 +2212,28 @@ Note	1003	/* select#1 */ select st_astext(`test`.`t1`.`p`) AS `ST_AsText(p)` fro
 SELECT ST_AsText(p) FROM t1 WHERE ST_Equals(p, ST_PointFromText('POINT(20 20)'));
 ST_AsText(p)
 DROP TABLE t1;
+#
+# Bug #21067378 GEOMETRIC OPERATION RETURNS ERROR INSTEAD OF RESULT
+#
+CREATE TABLE t1 (p POINT NOT NULL UNIQUE) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (ST_GEOMFROMTEXT('POINT(1 1)'));
+SELECT ST_ASTEXT(p) FROM t1
+WHERE MBRCOVEREDBY
+(
+p,
+ST_GEOMFROMTEXT('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))')
+);
+ST_ASTEXT(p)
+POINT(1 1)
+DROP TABLE t1;
+CREATE TABLE t1 (p POINT NOT NULL UNIQUE) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (ST_GEOMFROMTEXT('POINT(1 1)'));
+SELECT ST_ASTEXT(p) FROM t1
+WHERE MBRCOVEREDBY
+(
+p,
+ST_GEOMFROMTEXT('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))')
+);
+ST_ASTEXT(p)
+POINT(1 1)
+DROP TABLE t1;

mysql-test/t/gis.test

@@ -2240,3 +2240,33 @@ EXPLAIN SELECT ST_AsText(p) FROM t1 WHERE ST_Equals(p, ST_PointFromText('POINT(2
 SELECT ST_AsText(p) FROM t1 WHERE ST_Equals(p, ST_PointFromText('POINT(20 20)'));
 
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #21067378 GEOMETRIC OPERATION RETURNS ERROR INSTEAD OF RESULT
+--echo #
+
+CREATE TABLE t1 (p POINT NOT NULL UNIQUE) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (ST_GEOMFROMTEXT('POINT(1 1)'));
+
+SELECT ST_ASTEXT(p) FROM t1
+WHERE MBRCOVEREDBY
+(
+  p,
+  ST_GEOMFROMTEXT('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))')
+);
+
+DROP TABLE t1;
+
+CREATE TABLE t1 (p POINT NOT NULL UNIQUE) ENGINE=MyISAM;
+
+INSERT INTO t1 VALUES (ST_GEOMFROMTEXT('POINT(1 1)'));
+
+SELECT ST_ASTEXT(p) FROM t1
+WHERE MBRCOVEREDBY
+(
+  p,
+  ST_GEOMFROMTEXT('POLYGON((1 1, 1 2, 2 2, 2 1, 1 1))')
+);
+
+DROP TABLE t1;

sql/item_func.h

@@ -49,6 +49,8 @@ class Item_func :public Item_result_field
 public:
   uint arg_count;
   //bool const_item_cache;
+  // When updating Functype with new spatial functions,
+  // is_spatial_operator() should also be updated.
   enum Functype { UNKNOWN_FUNC,EQ_FUNC,EQUAL_FUNC,NE_FUNC,LT_FUNC,LE_FUNC,
 		  GE_FUNC,GT_FUNC,FT_FUNC,
 		  LIKE_FUNC,ISNULL_FUNC,ISNOTNULL_FUNC,

sql/opt_range.cc

@@ -6757,6 +6757,8 @@ bool is_spatial_operator(Item_func::Functype op_type)
   case Item_func::SP_CROSSES_FUNC:
   case Item_func::SP_WITHIN_FUNC:
   case Item_func::SP_CONTAINS_FUNC:
+  case Item_func::SP_COVEREDBY_FUNC:
+  case Item_func::SP_COVERS_FUNC:
   case Item_func::SP_OVERLAPS_FUNC:
   case Item_func::SP_STARTPOINT:
   case Item_func::SP_ENDPOINT:
@@ -7328,29 +7330,29 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item *conf_func, Field *field,
     set the most general geometry type while saving, and revert to the
     original geometry type afterwards.
   */
-  Field::geometry_type save_geom_type;
-  save_geom_type= Field::GEOM_GEOMETRY;
-  if (key_part->image_type == Field::itMBR &&
-      field->type() == MYSQL_TYPE_GEOMETRY)
   {
-    save_geom_type= field->get_geometry_type();
-    down_cast<Field_geom*, Field*>(field)->geom_type= Field::GEOM_GEOMETRY;
-  }
+    const Field::geometry_type save_geom_type=
+      (field->type() == MYSQL_TYPE_GEOMETRY) ?
+      field->get_geometry_type() :
+      Field::GEOM_GEOMETRY;
+    if (field->type() == MYSQL_TYPE_GEOMETRY)
+    {
+      down_cast<Field_geom*>(field)->geom_type= Field::GEOM_GEOMETRY;
+    }
 
-  bool always_true_or_false;
-  always_true_or_false=
-    save_value_and_handle_conversion(&tree, value, type, field,
-                                     &impossible_cond_cause, alloc);
+    bool always_true_or_false=
+      save_value_and_handle_conversion(&tree, value, type, field,
+                                       &impossible_cond_cause, alloc);
 
-  if (key_part->image_type == Field::itMBR &&
-      field->type() == MYSQL_TYPE_GEOMETRY &&
-      save_geom_type != Field::GEOM_GEOMETRY)
-  {
-    down_cast<Field_geom*, Field*>(field)->geom_type= save_geom_type;
+    if (field->type() == MYSQL_TYPE_GEOMETRY &&
+        save_geom_type != Field::GEOM_GEOMETRY)
+    {
+      down_cast<Field_geom*>(field)->geom_type= save_geom_type;
+    }
+
+    if (always_true_or_false)
+      goto end;
   }
-  
-  if (always_true_or_false)
-    goto end;
 
   /*
     Any sargable predicate except "<=>" involving NULL as a constant is always