diff options
author | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
commit | 69204571425ed3221e94c7eb1e030c00089bca26 (patch) | |
tree | 3d9cfbc44a057883c7db6bce267c8ebfd5fa9313 /mysql-test/suite/vcol/inc/vcol_keys.inc | |
parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
parent | d26aefb0775048128495eaab151ee4118f8f7afd (diff) | |
download | mariadb-git-69204571425ed3221e94c7eb1e030c00089bca26.tar.gz |
Merge with MariaDB 5.1
Diffstat (limited to 'mysql-test/suite/vcol/inc/vcol_keys.inc')
-rw-r--r-- | mysql-test/suite/vcol/inc/vcol_keys.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/suite/vcol/inc/vcol_keys.inc b/mysql-test/suite/vcol/inc/vcol_keys.inc index 68a40afea92..062f4e3f72c 100644 --- a/mysql-test/suite/vcol/inc/vcol_keys.inc +++ b/mysql-test/suite/vcol/inc/vcol_keys.inc @@ -94,11 +94,10 @@ drop table t1; --echo # SPATIAL INDEX if (!$skip_spatial_index_check) { - --echo # Error "All parts of a SPATIAL index must be NOT NULL" - --error ER_SPATIAL_CANT_HAVE_NULL + --error ER_WRONG_ARGUMENTS create table t1 (a int, b int 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_WRONG_ARGUMENTS alter table t1 add spatial index (b); drop table t1; } |