diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-06-20 00:21:41 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-06-20 00:21:41 +0500 |
| commit | b826c888417e258dc0da6b6c0d011960db38f4b9 (patch) | |
| tree | 4ab265b3c9f0db0fbc7cde2ebdd8073a10278f5f /mysql-test/suite/vcol/r/vcol_keys_myisam.result | |
| parent | 9d51588e9560e963fa6087513098c940b70b2e3d (diff) | |
| parent | 4058115cf74d00fcf0e432b23981c6393d5abbc5 (diff) | |
| download | mariadb-git-b826c888417e258dc0da6b6c0d011960db38f4b9.tar.gz | |
gis-related tests fixes.
merging.
Diffstat (limited to 'mysql-test/suite/vcol/r/vcol_keys_myisam.result')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_keys_myisam.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_keys_myisam.result b/mysql-test/suite/vcol/r/vcol_keys_myisam.result index af0935affbc..5ea3b625ec1 100644 --- a/mysql-test/suite/vcol/r/vcol_keys_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_keys_myisam.result @@ -19,7 +19,7 @@ t1 CREATE TABLE `t1` ( describe t1; Field Type Null Key Default Extra a int(11) YES NULL -b int(11) YES UNI NULL VIRTUAL +b int(11) YES UNI NULL PERSISTENT drop table t1; create table t1 (a int, b int as (a*2), unique key (b)); ERROR HY000: Key/Index cannot be defined on a non-stored computed column @@ -34,7 +34,7 @@ t1 CREATE TABLE `t1` ( describe t1; Field Type Null Key Default Extra a int(11) YES NULL -b int(11) YES UNI NULL VIRTUAL +b int(11) YES UNI NULL PERSISTENT drop table t1; create table t1 (a int, b int as (a*2)); alter table t1 add unique key (b); @@ -64,7 +64,7 @@ t1 CREATE TABLE `t1` ( describe t1; Field Type Null Key Default Extra a int(11) YES NULL -b int(11) YES MUL NULL VIRTUAL +b int(11) YES MUL NULL PERSISTENT drop table t1; create table t1 (a int, b int as (a*2) persistent, index (a,b)); show create table t1; @@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( describe t1; Field Type Null Key Default Extra a int(11) YES MUL NULL -b int(11) YES NULL VIRTUAL +b int(11) YES NULL PERSISTENT drop table t1; create table t1 (a int, b int as (a*2)); alter table t1 add index (b); @@ -101,10 +101,10 @@ drop table t1; # SPATIAL INDEX # Error "All parts of a SPATIAL index must be NOT NULL" create table t1 (a int, b int as (a+1) persistent, spatial index (b)); -ERROR 42000: All parts of a SPATIAL index must be NOT NULL +ERROR 42000: A SPATIAL index may only contain a geometrical type column create table t1 (a int, b int as (a+1) persistent); alter table t1 add spatial index (b); -ERROR 42000: All parts of a SPATIAL index must be NOT NULL +ERROR 42000: A SPATIAL index may only contain a geometrical type column drop table t1; # FOREIGN KEY # Rejected FK options. |