Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 106 insertions, 0 deletions

diff --git a/mysql-test/main/sp_gis.test b/mysql-test/main/sp_gis.test
new file mode 100644
index 00000000..74958685
--- /dev/null
+++ b/mysql-test/main/sp_gis.test
@@ -0,0 +1,106 @@
+-- source include/have_geometry.inc
+
+use test;
+
+#
+# BUG#21025: misleading error message when creating functions named 'x', or 'y'
+#
+
+--disable_warnings
+drop function if exists a;
+drop function if exists x;
+drop function if exists y;
+--enable_warnings
+
+--enable_prepare_warnings
+
+create function a() returns int
+return 1;
+
+create function x() returns int
+return 2;
+
+create function y() returns int
+return 3;
+
+select a();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+select x();
+--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+select y();
+select x(PointFromText("POINT(10 20)")), y(PointFromText("POINT(10 20)"));
+
+# Non deterministic warnings from db_load_routine
+--disable_warnings
+select test.a(), test.x(), test.y();
+--enable_warnings
+
+drop function a;
+drop function x;
+drop function y;
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-19944 Remove GIS data types from keyword list in lex.h
+--echo #
+
+CREATE FUNCTION point() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT point();
+--enable_warnings
+DROP FUNCTION point;
+
+CREATE FUNCTION point(x INT) RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT point(1);
+--enable_warnings
+DROP FUNCTION point;
+
+CREATE FUNCTION point(x INT, y INT) RETURNS POINT RETURN NULL;
+SELECT AsText(point(1,1));
+DROP FUNCTION point;
+
+CREATE FUNCTION linestring() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT linestring();
+--enable_warnings
+DROP FUNCTION linestring;
+
+CREATE FUNCTION polygon() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT polygon();
+--enable_warnings
+DROP FUNCTION polygon;
+
+CREATE FUNCTION multipoint() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT multipoint();
+--enable_warnings
+DROP FUNCTION multipoint;
+
+CREATE FUNCTION multilinestring() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT multilinestring();
+--enable_warnings
+DROP FUNCTION multilinestring;
+
+CREATE FUNCTION multipolygon() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT multipolygon();
+--enable_warnings
+DROP FUNCTION multipolygon;
+
+CREATE FUNCTION geometrycollection() RETURNS POINT RETURN NULL;
+--disable_warnings
+SELECT geometrycollection();
+--enable_warnings
+DROP FUNCTION geometrycollection;
+
+--disable_prepare_warnings
+
+--echo #
+--echo # End of 10.5 tests
+--echo #