gis2 fails in embedded

move privilege specific part of gis2.test to gis_notembedded.test
and the rest to gis.test

1 files changed, 0 insertions, 56 deletions

diff --git a/mysql-test/r/gis2.result b/mysql-test/r/gis2.result
deleted file mode 100644
index cb98ed9ac55..00000000000
--- a/mysql-test/r/gis2.result
+++ /dev/null
@@ -1,56 +0,0 @@
-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),
-   t_name varchar(64), geometry_column varchar(64), t_srid int)
-    SQL SECURITY INVOKER
-begin
-  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end	latin1	latin1_swedish_ci	latin1_swedish_ci
-show create procedure mysql.DropGeometryColumn;
-Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-DropGeometryColumn		CREATE DEFINER=`root`@`localhost` PROCEDURE `DropGeometryColumn`(catalog varchar(64), t_schema varchar(64),
-   t_name varchar(64), geometry_column varchar(64))
-    SQL SECURITY INVOKER
-begin
-  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end	latin1	latin1_swedish_ci	latin1_swedish_ci
-create table t1 (a int, b int);
-call mysql.AddGeometryColumn('', 'test', 't1', 'c', 10);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL,
-  `c` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-call mysql.DropGeometryColumn('', 'test', 't1', 'c');
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL,
-  `b` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-call mysql.DropGeometryColumn('', 'test', 't1', 'b');
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1;
-create user foo@localhost;
-grant execute on mysql.* to foo@localhost;
-call mysql.AddGeometryColumn('', 'mysql', 'proc', 'c', 10);
-ERROR 42000: ALTER command denied to user 'foo'@'localhost' for table 'proc'
-drop user foo@localhost;