- Moving Item_func_spatial_mbr_rel from Item_bool_func2 to Item_bool_func,

  as Item_func_spatial_mbr_rel needs nothing from Item_bool_func2.
- Renaming Item_func_spacial_rel (the class that implements precise spacial
  relations) to Item_func_spatial_precise_rel
- Adding a new abstract class Item_func_spatial_rel as a common parent
  for Item_func_spatial_precise_rel and Item_func_spatial_mbr_rel.

1 files changed, 15 insertions, 15 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index a37f61fc6aa..a55c9ef3de4 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -3560,8 +3560,8 @@ Create_func_contains Create_func_contains::s_singleton;
 Item*
 Create_func_contains::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_CONTAINS_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                  Item_func::SP_CONTAINS_FUNC);
 }
 #endif
 
@@ -3617,7 +3617,7 @@ Create_func_crosses Create_func_crosses::s_singleton;
 Item*
 Create_func_crosses::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
                                                    Item_func::SP_CROSSES_FUNC);
 }
 #endif
@@ -3800,8 +3800,8 @@ Create_func_disjoint Create_func_disjoint::s_singleton;
 Item*
 Create_func_disjoint::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_DISJOINT_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                  Item_func::SP_DISJOINT_FUNC);
 }
 
 
@@ -3931,8 +3931,8 @@ Create_func_equals Create_func_equals::s_singleton;
 Item*
 Create_func_equals::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_EQUALS_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                    Item_func::SP_EQUALS_FUNC);
 }
 #endif
 
@@ -4427,7 +4427,7 @@ Create_func_relate Create_func_relate::s_singleton;
 Item*
 Create_func_relate::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *matrix)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2, matrix);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2, matrix);
 }
 
 
@@ -4446,8 +4446,8 @@ Create_func_intersects Create_func_intersects::s_singleton;
 Item*
 Create_func_intersects::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_INTERSECTS_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                Item_func::SP_INTERSECTS_FUNC);
 }
 
 
@@ -5048,8 +5048,8 @@ Create_func_overlaps Create_func_overlaps::s_singleton;
 Item*
 Create_func_overlaps::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_OVERLAPS_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                  Item_func::SP_OVERLAPS_FUNC);
 }
 #endif
 
@@ -5485,7 +5485,7 @@ Create_func_touches Create_func_touches::s_singleton;
 Item*
 Create_func_touches::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
                                                    Item_func::SP_TOUCHES_FUNC);
 }
 #endif
@@ -5636,8 +5636,8 @@ Create_func_within Create_func_within::s_singleton;
 Item*
 Create_func_within::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
-  return new (thd->mem_root) Item_func_spatial_rel(arg1, arg2,
-                                                   Item_func::SP_WITHIN_FUNC);
+  return new (thd->mem_root) Item_func_spatial_precise_rel(arg1, arg2,
+                                                    Item_func::SP_WITHIN_FUNC);
 }
 #endif