diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/suite/vcol/inc/vcol_keys.inc | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'mysql-test/suite/vcol/inc/vcol_keys.inc')
-rw-r--r-- | mysql-test/suite/vcol/inc/vcol_keys.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/vcol/inc/vcol_keys.inc b/mysql-test/suite/vcol/inc/vcol_keys.inc index 68a40afea92..bba58363a81 100644 --- a/mysql-test/suite/vcol/inc/vcol_keys.inc +++ b/mysql-test/suite/vcol/inc/vcol_keys.inc @@ -96,9 +96,9 @@ if (!$skip_spatial_index_check) { --echo # Error "All parts of a SPATIAL index must be NOT NULL" --error ER_SPATIAL_CANT_HAVE_NULL - create table t1 (a int, b int as (a+1) persistent, spatial index (b)); + create table t1 (a int, b geometry as (a+1) persistent, spatial index (b)); create table t1 (a int, b int as (a+1) persistent); - --error ER_SPATIAL_CANT_HAVE_NULL + --error ER_SPATIAL_MUST_HAVE_GEOM_COL alter table t1 add spatial index (b); drop table t1; } |