From 2895f361d9a7a27ec6cd48dfac0d79522cb300c8 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 8 Jan 2019 15:14:15 +0200
Subject: [PATCH] MXS-2242 Add change that fixes the problem

A whole slew of missing builtin functions were added, not just the
ones directly relevant for MXS-2242.
---
 .../qc_sqlite/builtin_functions.c             | 115 ++++++++++++++++--
 1 file changed, 107 insertions(+), 8 deletions(-)

diff --git a/query_classifier/qc_sqlite/builtin_functions.c b/query_classifier/qc_sqlite/builtin_functions.c
index 7839441ed..7e0458cd4 100644
--- a/query_classifier/qc_sqlite/builtin_functions.c
+++ b/query_classifier/qc_sqlite/builtin_functions.c
@@ -187,25 +187,124 @@ static const char* BUILTIN_FUNCTIONS[] =
 
     // Geometry Properties
     // https://mariadb.com/kb/en/mariadb/geometry-properties/
-    // TODO
+    "boundary",
+    "dimension",
+    "envelope",
+    "geometryn",
+    "geometrytype",
+    "isclosed",
+    "isempty",
+    "isring",
+    "issimple",
+    "numgeometries",
+    "srid",
+    "st_boundary",
+    "st_dimension",
+    "st_envelope",
+    "st_geometryn",
+    "st_geometrytype",
+    "st_isclosed",
+    "st_isempty",
+    "st_isring",
+    "st_issimple",
+    "st_numgeometries",
+    "st_relate",
+    "st_srid",
 
     // Geometry Relations
-    // TODO
+    // https://mariadb.com/kb/en/library/geometry-relations/
+    "contains",
+    "crosses",
+    "disjoint",
+    "equals",
+    "intersects",
+    "overlaps",
+    "st_contains",
+    "st_crosses",
+    "st_difference",
+    "st_disjoint",
+    "st_distance",
+    "st_equals",
+    "st_intersects",
+    "st_length",
+    "st_overlaps",
+    "st_touches",
+    "st_within",
+    "touches",
+    "within",
 
     // LineString Properties
-    // TODO
+    // https://mariadb.com/kb/en/library/linestring-properties/
+    "endpoint",
+    "glength",
+    "numpoints",
+    "pointn",
+    "startpoint",
+    "st_endpoint",
+    "st_numpoints",
+    "st_pointn",
+    "st_startpoint",
 
     // MBR
-    // TODO
+    // https://mariadb.com/kb/en/library/mbr-minimum-bounding-rectangle/
+    "mbrcontains",
+    "mbrdisjoint",
+    "mbrequal",
+    "mbrintersects",
+    "mbroverlaps",
+    "mbrtouches",
+    "mbrwithin",
 
-    // Point Propertoes
-    // TODO
+    // Point Properties
+    // https://mariadb.com/kb/en/library/point-properties/
+    "st_x",
+    "st_y",
+    "x",
+    "y",
 
     // Polygon Properties
-    // TODO
+    // https://mariadb.com/kb/en/library/polygon-properties/
+    "area",
+    "centroid",
+    "exteriorring",
+    "interiorringn",
+    "numinteriorrings",
+    "st_area",
+    "st_centroid",
+    "st_exteriorring",
+    "st_interiorringn",
+    "st_numinteriorrings",
 
     // WKB
-    // TODO
+    // https://mariadb.com/kb/en/library/wkb/
+    "asbinary",
+    "aswkb",
+    "mlinefromwkb",
+    "mpointfromwkb",
+    "mpolyfromwkb",
+    "geomcollfromwkb",
+    "geometrycollectionfromwkb",
+    "geometryfromwkb",
+    "geomfromwkb",
+    "linefromwkb",
+    "linestringfromwkb",
+    "multilinestringfromwkb",
+    "multipointfromwkb",
+    "multipolygonfromwkb",
+    "pointfromwkb",
+    "polyfromwkb",
+    "polygonfromwkb",
+    "st_asbinary",
+    "st_aswkb",
+    "st_geomcollfromwkb",
+    "st_geometrycollectionfromwkb",
+    "st_geometryfromwkb",
+    "st_geomfromwkb",
+    "st_linefromwkb",
+    "st_linestringfromwkb",
+    "st_pointfromwkb",
+    "st_polyfromwkb",
+    "st_polygonfromwkb",
 
     // WKT
     // https://mariadb.com/kb/en/mariadb/wkt/