enable spatial indexes in innodb vcol tests

mysql-test/suite/vcol/r/vcol_keys_innodb.result

@@ -99,6 +99,13 @@ drop table t1;
 #
 # TODO: FULLTEXT INDEX
 # SPATIAL INDEX
+# Error "All parts of a SPATIAL index must be NOT NULL"
+create table t1 (a int, b geometry as (a+1) persistent, spatial index (b));
+ERROR 42000: All parts of a SPATIAL index must be NOT NULL
+create table t1 (a int, b int as (a+1) persistent);
+alter table t1 add spatial index (b);
+ERROR HY000: Incorrect arguments to SPATIAL INDEX
+drop table t1;
 # FOREIGN KEY
 # Rejected FK options.
 create table t1 (a int, b int as (a+1) persistent,

mysql-test/suite/vcol/t/vcol_keys_innodb.test

@@ -34,14 +34,13 @@
 ##### Storage engine to be tested
 # Set the session storage engine
 --source include/have_innodb.inc
-eval SET @@session.storage_engine = 'InnoDB';
+SET @@session.storage_engine = 'InnoDB';
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
-let $skip_spatial_index_check = 1;
 --source suite/vcol/inc/vcol_keys.inc
 
 #------------------------------------------------------------------------------#

mysql-test/suite/vcol/t/vcol_keys_myisam.test

@@ -33,7 +33,7 @@
 
 ##### Storage engine to be tested
 # Set the session storage engine
-eval SET @@session.storage_engine = 'MyISAM';
+SET @@session.storage_engine = 'MyISAM';
 
 ##### Workarounds for known open engine specific bugs
 #     none