bug #22682 Test fails --without-geometry

geometry dependent parts moved to proper .test files


mysql-test/r/gis.result:
  result fixed
mysql-test/r/innodb.result:
  result fixed
mysql-test/r/innodb_gis.result:
  result fixed
mysql-test/r/view.result:
  result fixed
mysql-test/t/gis.test:
  HAVE_GEOMETRY dependent part moved here from view.test
mysql-test/t/innodb.test:
  HAVE_GEOMETRY dependent part moved to innodb_gis.test
BitKeeper/etc/ignore:
  Added libmysqld/sql_servers.cc to the ignore list
mysql-test/t/innodb_gis.test:
  HAVE_GEOMETRY dependent part moved here from innodb.test
mysql-test/t/view.test:
  HAVE_GEOMETRY dependent part moved to gis.test

4 files changed, 16 insertions, 15 deletions

diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
index 196ff5b8ff0..d1ea8dbe18f 100644
--- a/mysql-test/t/gis.test
+++ b/mysql-test/t/gis.test
@@ -428,3 +428,13 @@ drop table t1;
 create table t1 select GeomFromText('point(1 1)');
 desc t1;
 drop table t1;
+
+#
+# Bug #11335 View redefines column types
+#
+create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
+create view v1 as select * from t1;
+desc v1;
+drop view v1;
+drop table t1;
+
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index e1e74ac8a11..bbecd787324 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -2489,12 +2489,6 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over';
 drop table t2, t1;
 
 #
-# Bug #15680 (SPATIAL key in innodb)
-#
---error ER_TABLE_CANT_HANDLE_SPKEYS
-create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
-
-#
 # Test optimize on table with open transaction
 #
 
diff --git a/mysql-test/t/innodb_gis.test b/mysql-test/t/innodb_gis.test
index 142b526af92..9675b6b69dc 100644
--- a/mysql-test/t/innodb_gis.test
+++ b/mysql-test/t/innodb_gis.test
@@ -1,3 +1,9 @@
 --source include/have_innodb.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc
+
+#
+# Bug #15680 (SPATIAL key in innodb)
+#
+--error ER_TABLE_CANT_HANDLE_SPKEYS
+create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 7175db1db4e..ad73a39dc54 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1879,15 +1879,6 @@ DROP VIEW v1;
 DROP TABLE t1;
 
 #
-# Bug #11335 View redefines column types
-#
-create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);
-create view v1 as select * from t1;
-desc v1;
-drop view v1;
-drop table t1;
-
-#
 # Bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
 #             subtime() in view
 create table t1(f1 datetime);