diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
| commit | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (patch) | |
| tree | c40b137e083a5adccc139a844c0f8d085283fc32 /mysql-test/suite/gcol | |
| parent | c676f58c270d75b6c1889b24b9833afc65b0d98b (diff) | |
| parent | a6585d5ce99c2efdd75884b989250e2de8203cca (diff) | |
| download | mariadb-git-1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/gcol')
5 files changed, 17 insertions, 17 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 3bc5348b20a..ee80e5f605a 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 @@ -357,14 +357,14 @@ DROP TABLE t1; SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2; Warnings: -Warning 1906 The value specified for generated column 'c2' in table 't1' ignored +Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored CREATE TABLE t2 (a int); INSERT INTO t2 values(1); DROP TABLE t1; SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2; Warnings: -Warning 1906 The value specified for generated column 'c2' in table 't1' ignored +Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored DROP TABLE t1; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5; SELECT * FROM t1; 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 56d048f1d7a..09e5b617af1 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 @@ -357,14 +357,14 @@ DROP TABLE t1; SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5 AS c2; Warnings: -Warning 1906 The value specified for generated column 'c2' in table 't1' ignored +Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored CREATE TABLE t2 (a int); INSERT INTO t2 values(1); DROP TABLE t1; SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2; Warnings: -Warning 1906 The value specified for generated column 'c2' in table 't1' ignored +Warning 1906 The value specified for generated column 'c2' in table 't1' has been ignored DROP TABLE t1; CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5; SELECT * FROM t1; diff --git a/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result b/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result index 3c2e4d3dd0a..3024b58da54 100644 --- a/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols insert ignore into t1 values (1,2,3); Warnings: -Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against gcols insert ignore into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -153,7 +153,7 @@ a b c 2 -2 -2 update ignore t1 set c=3 where a=2; Warnings: -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1 order by a; a b c 1 -1 -1 @@ -183,7 +183,7 @@ a b c 2 -2 -2 update ignore t1 set c=3 where b=-2; Warnings: -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1 order by a; a b c 1 -1 -1 diff --git a/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result b/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result index 4d62a5d7a82..c7e5cab4f8c 100644 --- a/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_ins_upd_myisam.result @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols insert ignore into t1 values (1,2,3); Warnings: -Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against gcols insert ignore into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1906 The value specified for generated column 'b' in table 't1' ignored -Warning 1906 The value specified for generated column 'b' in table 't1' ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored +Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -153,7 +153,7 @@ a b c 2 -2 -2 update ignore t1 set c=3 where a=2; Warnings: -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1 order by a; a b c 1 -1 -1 @@ -183,7 +183,7 @@ a b c 2 -2 -2 update ignore t1 set c=3 where b=-2; Warnings: -Warning 1906 The value specified for generated column 'c' in table 't1' ignored +Warning 1906 The value specified for generated column 'c' in table 't1' has been ignored select * from t1 order by a; a b c 1 -1 -1 diff --git a/mysql-test/suite/gcol/r/gcol_partition_innodb.result b/mysql-test/suite/gcol/r/gcol_partition_innodb.result index 7600c9792f1..e5a68cdb177 100644 --- a/mysql-test/suite/gcol/r/gcol_partition_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_partition_innodb.result @@ -99,7 +99,7 @@ INSERT IGNORE INTO t1 (d) VALUES ('2015-04-14'); SET sql_mode= ''; REPLACE INTO t1 SELECT * FROM t1; Warnings: -Warning 1906 The value specified for generated column 'vd' in table 't1' ignored +Warning 1906 The value specified for generated column 'vd' in table 't1' has been ignored DROP TABLE t1; InnoDB 0 transactions not purged DROP VIEW IF EXISTS v1,v2; |