summaryrefslogtreecommitdiff
path: root/sql/spatial.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-06-26 15:42:49 +0400
committerAlexander Barkov <bar@mariadb.org>2015-06-26 15:42:49 +0400
commit436411860ec54fda959910a3c88a1e393e1cee59 (patch)
tree25651900a88706de7693638b629d472d704aa1ff /sql/spatial.h
parent4f828a1cac9a9c378a2a9f3c3ef0710eaf11ce02 (diff)
downloadmariadb-git-436411860ec54fda959910a3c88a1e393e1cee59.tar.gz
Moving ST_RELATE() implementation out of Item_func_precise_spatial_rel,
adding a separte class Item_func_spatial_relate for ST_RELATE(). This is a preparatory patch for: MDEV-8239 Reverse spatial operations OP(const, field) do not get optimized
Diffstat (limited to 'sql/spatial.h')
-rw-r--r--sql/spatial.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/spatial.h b/sql/spatial.h
index b850d405228..6f50acac984 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -71,7 +71,11 @@ struct MBR
MBR(const st_point_2d &min, const st_point_2d &max)
:xmin(min.x), ymin(min.y), xmax(max.x), ymax(max.y)
{}
-
+
+ MBR(const MBR &mbr1, const MBR &mbr2)
+ :xmin(mbr1.xmin), ymin(mbr1.ymin), xmax(mbr1.xmax), ymax(mbr1.ymax)
+ { add_mbr(&mbr2); }
+
inline void add_xy(double x, double y)
{
/* Not using "else" for proper one point MBR calculation */