diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:02:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:03:19 +0200 |
| commit | c3a6c683e2bba4111a69a34303af13ff9a45b46a (patch) | |
| tree | d769537a9ef4b6602ce548bf4ccf037e1a78519f /mysql-test/suite/gcol | |
| parent | f03f4da66373161d604b8ecf3c23ae18d08c0461 (diff) | |
| parent | 72b934e3f7d5f0c717cb98b718c9529c74741b4a (diff) | |
| download | mariadb-git-c3a6c683e2bba4111a69a34303af13ff9a45b46a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/gcol')
| -rw-r--r-- | mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result b/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result index 1f3a1b641ba..6c2cd8a18c8 100644 --- a/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result @@ -255,9 +255,9 @@ a b c 4 -4 -3 drop table t1; create table t1 (a int, b int generated always as(-b) virtual, c int generated always as (b + 1) virtual); -ERROR 01000: Expression for field `b` is refering to uninitialized field `b` +ERROR 01000: Expression for field `b` is referring to uninitialized field `b` create table t1 (a int, b int generated always as(-c) virtual, c int generated always as (b + 1) virtual); -ERROR 01000: Expression for field `b` is refering to uninitialized field `c` +ERROR 01000: Expression for field `b` is referring to uninitialized field `c` create table t1 (pk int auto_increment primary key, col_int_nokey int generated always as (pk + col_int_key) stored, col_int_key int); ERROR HY000: Function or expression 'AUTO_INCREMENT' cannot be used in the GENERATED ALWAYS AS clause of `pk` # Bug#20339347: FAIL TO USE CREATE ....SELECT STATEMENT TO CREATE A NEW TABLE @@ -277,7 +277,7 @@ drop table t1,tt; # THD->CHANGE_LIST.IS_EMPTY() # CREATE TABLE t1(a bigint AS (a between 1 and 1)); -ERROR 01000: Expression for field `a` is refering to uninitialized field `a` +ERROR 01000: Expression for field `a` is referring to uninitialized field `a` # Bug#20757211: GENERATED COLUMNS: ALTER TABLE CRASHES # IN FIND_FIELD_IN_TABLE # diff --git a/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result b/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result index 40029079943..85370d42af8 100644 --- a/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result @@ -255,9 +255,9 @@ a b c 4 -4 -3 drop table t1; create table t1 (a int, b int generated always as(-b) virtual, c int generated always as (b + 1) virtual); -ERROR 01000: Expression for field `b` is refering to uninitialized field `b` +ERROR 01000: Expression for field `b` is referring to uninitialized field `b` create table t1 (a int, b int generated always as(-c) virtual, c int generated always as (b + 1) virtual); -ERROR 01000: Expression for field `b` is refering to uninitialized field `c` +ERROR 01000: Expression for field `b` is referring to uninitialized field `c` create table t1 (pk int auto_increment primary key, col_int_nokey int generated always as (pk + col_int_key) stored, col_int_key int); ERROR HY000: Function or expression 'AUTO_INCREMENT' cannot be used in the GENERATED ALWAYS AS clause of `pk` # Bug#20339347: FAIL TO USE CREATE ....SELECT STATEMENT TO CREATE A NEW TABLE @@ -277,7 +277,7 @@ drop table t1,tt; # THD->CHANGE_LIST.IS_EMPTY() # CREATE TABLE t1(a bigint AS (a between 1 and 1)); -ERROR 01000: Expression for field `a` is refering to uninitialized field `a` +ERROR 01000: Expression for field `a` is referring to uninitialized field `a` # Bug#20757211: GENERATED COLUMNS: ALTER TABLE CRASHES # IN FIND_FIELD_IN_TABLE # |