Merge branch '2.2' into 2.3
This commit is contained in:
@ -119,7 +119,7 @@ fi
|
|||||||
sudo tar xzf cmake-3.7.1-Linux-x86_64.tar.gz -C /usr/ --strip-components=1
|
sudo tar xzf cmake-3.7.1-Linux-x86_64.tar.gz -C /usr/ --strip-components=1
|
||||||
|
|
||||||
cmake_version=`cmake --version | grep "cmake version" | awk '{ print $3 }'`
|
cmake_version=`cmake --version | grep "cmake version" | awk '{ print $3 }'`
|
||||||
if [ "$cmake_version" \< "3.7.1" ] ; then
|
if [ "`echo -e "3.7.1\n$cmake_version"|sort -V|head -n 1`" != "3.7.1" ] ; then
|
||||||
echo "cmake does not work! Trying to build from source"
|
echo "cmake does not work! Trying to build from source"
|
||||||
wget -q https://cmake.org/files/v3.7/cmake-3.7.1.tar.gz --no-check-certificate
|
wget -q https://cmake.org/files/v3.7/cmake-3.7.1.tar.gz --no-check-certificate
|
||||||
tar xzf cmake-3.7.1.tar.gz
|
tar xzf cmake-3.7.1.tar.gz
|
||||||
|
@ -10,6 +10,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
|
|||||||
|
|
||||||
## Bug fixes
|
## Bug fixes
|
||||||
|
|
||||||
|
* [MXS-2242](https://jira.mariadb.org/browse/MXS-2242) MaxScale does not recognize builtin read-only functions
|
||||||
* [MXS-2238](https://jira.mariadb.org/browse/MXS-2238) MaxScale fails to send large CDC schemas
|
* [MXS-2238](https://jira.mariadb.org/browse/MXS-2238) MaxScale fails to send large CDC schemas
|
||||||
* [MXS-2234](https://jira.mariadb.org/browse/MXS-2234) Add extra info to log when MaxScale loads persisted configuration files
|
* [MXS-2234](https://jira.mariadb.org/browse/MXS-2234) Add extra info to log when MaxScale loads persisted configuration files
|
||||||
* [MXS-2232](https://jira.mariadb.org/browse/MXS-2232) version_string prefix 5.5.5- is always added
|
* [MXS-2232](https://jira.mariadb.org/browse/MXS-2232) version_string prefix 5.5.5- is always added
|
||||||
|
@ -187,25 +187,124 @@ static const char* BUILTIN_FUNCTIONS[] =
|
|||||||
|
|
||||||
// Geometry Properties
|
// Geometry Properties
|
||||||
// https://mariadb.com/kb/en/mariadb/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
|
// 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
|
// 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
|
// MBR
|
||||||
// TODO
|
// https://mariadb.com/kb/en/library/mbr-minimum-bounding-rectangle/
|
||||||
|
"mbrcontains",
|
||||||
|
"mbrdisjoint",
|
||||||
|
"mbrequal",
|
||||||
|
"mbrintersects",
|
||||||
|
"mbroverlaps",
|
||||||
|
"mbrtouches",
|
||||||
|
"mbrwithin",
|
||||||
|
|
||||||
// Point Propertoes
|
// Point Properties
|
||||||
// TODO
|
// https://mariadb.com/kb/en/library/point-properties/
|
||||||
|
"st_x",
|
||||||
|
"st_y",
|
||||||
|
"x",
|
||||||
|
"y",
|
||||||
|
|
||||||
// Polygon Properties
|
// 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
|
// 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
|
// WKT
|
||||||
// https://mariadb.com/kb/en/mariadb/wkt/
|
// https://mariadb.com/kb/en/mariadb/wkt/
|
||||||
|
@ -115,3 +115,6 @@ PREPARE a FROM @sql;
|
|||||||
|
|
||||||
# MXS-2207
|
# MXS-2207
|
||||||
SET STATEMENT max_statement_time=30 FOR UPDATE tbl SET a = 42;
|
SET STATEMENT max_statement_time=30 FOR UPDATE tbl SET a = 42;
|
||||||
|
|
||||||
|
# MXS-2242
|
||||||
|
SELECT X(coordinates), Y(coordinates), ST_X(coordinates), ST_Y(coordinates) FROM data;
|
||||||
|
Reference in New Issue
Block a user