From 3fe38574fbddd0594ac8ad8da10049a47cca6879 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 27 Apr 2019 04:49:04 +0200
Subject: [PATCH] gis2 fails in embedded

move privilege specific part of gis2.test to gis_notembedded.test
and the rest to gis.test
---
 mysql-test/r/gis.result                        | 14 ++++++++++++++
 .../r/{gis2.result => gis_notembedded.result}  | 14 --------------
 mysql-test/t/gis.test                          | 17 +++++++++++++++++
 .../t/{gis2.test => gis_notembedded.test}      | 18 +-----------------
 4 files changed, 32 insertions(+), 31 deletions(-)
 rename mysql-test/r/{gis2.result => gis_notembedded.result} (83%)
 rename mysql-test/t/{gis2.test => gis_notembedded.test} (56%)

diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index f89cceb3664..76524311f01 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -1877,3 +1877,17 @@ t2	CREATE TABLE `t2` (
   `w2` int(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1,t2;
+CREATE TABLE t1 (
+id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+point_data POINT NOT NULL,
+PRIMARY KEY (id),
+KEY idx_point_data(point_data)
+) ENGINE=MyISAM;
+INSERT t1 (point_data) VALUES
+(GeomFromText('Point(37.0248492 23.8512726)')),
+(GeomFromText('Point(38.0248492 23.8512726)'));
+SELECT id FROM t1
+WHERE ST_Contains(point_data, GeomFromText('Point(38.0248492 23.8512726)'));
+id
+2
+DROP TABLE t1;
diff --git a/mysql-test/r/gis2.result b/mysql-test/r/gis_notembedded.result
similarity index 83%
rename from mysql-test/r/gis2.result
rename to mysql-test/r/gis_notembedded.result
index cb98ed9ac55..eb1e2b98917 100644
--- a/mysql-test/r/gis2.result
+++ b/mysql-test/r/gis_notembedded.result
@@ -1,17 +1,3 @@
-CREATE TABLE t1 (
-id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-point_data POINT NOT NULL,
-PRIMARY KEY (id),
-KEY idx_point_data(point_data)
-) ENGINE=MyISAM;
-INSERT t1 (point_data) VALUES
-(GeomFromText('Point(37.0248492 23.8512726)')),
-(GeomFromText('Point(38.0248492 23.8512726)'));
-SELECT id FROM t1
-WHERE ST_Contains(point_data, GeomFromText('Point(38.0248492 23.8512726)'));
-id
-2
-DROP TABLE t1;
 show create procedure mysql.AddGeometryColumn;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 AddGeometryColumn		CREATE DEFINER=`root`@`localhost` PROCEDURE `AddGeometryColumn`(catalog varchar(64), t_schema varchar(64),
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 9decb5604e8..db3ab00fb03 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -1568,3 +1568,20 @@ CREATE TABLE t1 (g1 GEOMETRY NOT NULL,g2 GEOMETRY NULL);
 CREATE TABLE t2 AS SELECT WITHIN(g1,g1) as w1,WITHIN(g2,g2) AS w2 FROM t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t1,t2;
+
+#
+# MDEV-3934 Assertion `((keypart_map+1) & keypart_map) == 0' failed in _mi_pack_key with an index on a POINT column
+#
+
+CREATE TABLE t1 (
+      id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+      point_data POINT NOT NULL,
+      PRIMARY KEY (id),
+      KEY idx_point_data(point_data)
+) ENGINE=MyISAM;
+INSERT t1 (point_data) VALUES
+    (GeomFromText('Point(37.0248492 23.8512726)')),
+    (GeomFromText('Point(38.0248492 23.8512726)'));
+SELECT id FROM t1
+WHERE ST_Contains(point_data, GeomFromText('Point(38.0248492 23.8512726)'));
+DROP TABLE t1;
diff --git a/mysql-test/t/gis2.test b/mysql-test/t/gis_notembedded.test
similarity index 56%
rename from mysql-test/t/gis2.test
rename to mysql-test/t/gis_notembedded.test
index 26422b95411..d25d6a7097e 100644
--- a/mysql-test/t/gis2.test
+++ b/mysql-test/t/gis_notembedded.test
@@ -1,20 +1,4 @@
-#
-# MDEV-3934 Assertion `((keypart_map+1) & keypart_map) == 0' failed in _mi_pack_key with an index on a POINT column
-#
-
-CREATE TABLE t1 (
-      id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-      point_data POINT NOT NULL,
-      PRIMARY KEY (id),
-      KEY idx_point_data(point_data)
-) ENGINE=MyISAM;
-INSERT t1 (point_data) VALUES
-    (GeomFromText('Point(37.0248492 23.8512726)')),
-    (GeomFromText('Point(38.0248492 23.8512726)'));
-SELECT id FROM t1
-WHERE ST_Contains(point_data, GeomFromText('Point(38.0248492 23.8512726)'));
-DROP TABLE t1;
-
+source include/not_embedded.inc;
 #
 # MDEV-60 Support for Spatial Reference systems for the GIS data.
 #