diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-15 23:53:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-12 20:27:35 +0100 |
| commit | 4136968ca0910c1e4fc0191a659fbdc113fbf709 (patch) | |
| tree | 0560297081b6b1064ba105f16ad982975cc3fa76 | |
| parent | c2b2cb8acd7fd8b84f5929f9c7b52961973c9b9f (diff) | |
| download | mariadb-git-4136968ca0910c1e4fc0191a659fbdc113fbf709.tar.gz | |
enable spatial indexes in innodb vcol tests
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_keys_innodb.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_keys_innodb.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_keys_myisam.test | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_keys_innodb.result b/mysql-test/suite/vcol/r/vcol_keys_innodb.result index 5070981f08f..6c7429b2a03 100644 --- a/mysql-test/suite/vcol/r/vcol_keys_innodb.result +++ b/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, diff --git a/mysql-test/suite/vcol/t/vcol_keys_innodb.test b/mysql-test/suite/vcol/t/vcol_keys_innodb.test index e408672ac07..34efc6e1f30 100644 --- a/mysql-test/suite/vcol/t/vcol_keys_innodb.test +++ b/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 #------------------------------------------------------------------------------# diff --git a/mysql-test/suite/vcol/t/vcol_keys_myisam.test b/mysql-test/suite/vcol/t/vcol_keys_myisam.test index 87d7b79aa1c..26f4a2c5ae1 100644 --- a/mysql-test/suite/vcol/t/vcol_keys_myisam.test +++ b/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 |