Merge 10.1 into 10.2

8 files changed, 54 insertions, 54 deletions

diff --git a/mysql-test/suite/vcol/r/binlog.result b/mysql-test/suite/vcol/r/binlog.result
index 35bfb50ba2f..83382d47511 100644
--- a/mysql-test/suite/vcol/r/binlog.result
+++ b/mysql-test/suite/vcol/r/binlog.result
@@ -18,10 +18,10 @@ set binlog_row_image="FULL";
 CREATE VIEW v1 AS SELECT * FROM t1;
 REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1982 FROM t1;
 Warnings:
-Warning	1906	The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning	1906	The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' has been ignored
 select col_date,col_int,col_blob,col_year from v1;
 col_date	col_int	col_blob	col_year
 2010-04-24	5	foo	1982
@@ -35,10 +35,10 @@ set binlog_row_image="MINIMAL";
 CREATE VIEW v1 AS SELECT * FROM t1;
 REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1983 FROM t1;
 Warnings:
-Warning	1906	The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning	1906	The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' has been ignored
 select col_date,col_int,col_blob,col_year from v1;
 col_date	col_int	col_blob	col_year
 2010-04-24	5	foo	1983
@@ -52,10 +52,10 @@ set @@binlog_row_image="NOBLOB";
 CREATE VIEW v1 AS SELECT * FROM t1;
 REPLACE INTO v1 SELECT pk, vcol_date, vcol_int, vcol_year, vcol_blob, col_date, col_int, col_blob, 1984 FROM t1;
 Warnings:
-Warning	1906	The value specified for generated column 'vcol_date' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_int' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_year' in table 't1' ignored
-Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' ignored
+Warning	1906	The value specified for generated column 'vcol_date' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_int' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_year' in table 't1' has been ignored
+Warning	1906	The value specified for generated column 'vcol_blob' in table 't1' has been ignored
 select col_date,col_int,col_blob,col_year from v1;
 col_date	col_int	col_blob	col_year
 2010-04-24	5	foo	1984
diff --git a/mysql-test/suite/vcol/r/partition.result b/mysql-test/suite/vcol/r/partition.result
index 6afc57be067..bd1353fa145 100644
--- a/mysql-test/suite/vcol/r/partition.result
+++ b/mysql-test/suite/vcol/r/partition.result
@@ -26,5 +26,5 @@ partition pn values less than (maxvalue));
 insert t1 set i= 0;
 set statement sql_mode= '' for update t1 set i= 1, v= 2;
 Warnings:
-Warning	1906	The value specified for generated column 'v' in table 't1' ignored
+Warning	1906	The value specified for generated column 'v' in table 't1' has been ignored
 drop table t1;
diff --git a/mysql-test/suite/vcol/r/update.result b/mysql-test/suite/vcol/r/update.result
index 5a6355e1773..2576859b00b 100644
--- a/mysql-test/suite/vcol/r/update.result
+++ b/mysql-test/suite/vcol/r/update.result
@@ -74,10 +74,10 @@ b int, c blob as (b), index (c(57)),
 d blob, e blob as (d), index (e(57)))
 replace select * from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
diff --git a/mysql-test/suite/vcol/r/update_binlog.result b/mysql-test/suite/vcol/r/update_binlog.result
index d4102fc460a..9a22005f062 100644
--- a/mysql-test/suite/vcol/r/update_binlog.result
+++ b/mysql-test/suite/vcol/r/update_binlog.result
@@ -76,10 +76,10 @@ b int, c blob as (b), index (c(57)),
 d blob, e blob as (d), index (e(57)))
 replace select * from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
@@ -256,10 +256,10 @@ b int, c blob as (b), index (c(57)),
 d blob, e blob as (d), index (e(57)))
 replace select * from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
-Warning	1906	The value specified for generated column 'c' in table 't' ignored
-Warning	1906	The value specified for generated column 'e' in table 't' ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'c' in table 't' has been ignored
+Warning	1906	The value specified for generated column 'e' in table 't' has been ignored
 check table t;
 Table	Op	Msg_type	Msg_text
 test.t	check	status	OK
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
index f45bd8a6b55..3629307a54d 100644
--- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
+++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
@@ -25,8 +25,8 @@ a	b	c
 # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
 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 vcols
 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
@@ -107,8 +107,8 @@ a	b	c
 create table t2 like t1;
 insert ignore into t2 select * from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'c' in table 't2' ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'c' in table 't2' has been ignored
 select * from t1;
 a	b	c
 2	-2	-2
@@ -123,8 +123,8 @@ a	b	c
 create table t2 like t1;
 insert ignore into t2 (a,b) select a,b from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
 select * from t2;
 a	b	c
 2	-2	-2
@@ -159,7 +159,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;
 a	b	c
 1	-1	-1
@@ -189,7 +189,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;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
index ef8f3f00e42..8eb59ca32ff 100644
--- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
@@ -25,8 +25,8 @@ a	b	c
 # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
 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 vcols
 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
@@ -107,8 +107,8 @@ a	b	c
 create table t2 like t1;
 insert ignore into t2 select * from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'c' in table 't2' ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'c' in table 't2' has been ignored
 select * from t1;
 a	b	c
 2	-2	-2
@@ -123,8 +123,8 @@ a	b	c
 create table t2 like t1;
 insert ignore into t2 (a,b) select a,b from t1;
 Warnings:
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
 select * from t2;
 a	b	c
 2	-2	-2
@@ -159,7 +159,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;
 a	b	c
 1	-1	-1
@@ -189,7 +189,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;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index 1de5fe8a0c1..bedc44e7fc4 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -108,10 +108,10 @@ DROP TABLE t1,t2;
 CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL);
 INSERT IGNORE INTO t1 VALUES (0,1,0);
 Warnings:
-Warning	1906	The value specified for generated column 'v' in table 't1' ignored
+Warning	1906	The value specified for generated column 'v' in table 't1' has been ignored
 INSERT IGNORE INTO t1 VALUES (NULL,0,0);
 Warnings:
-Warning	1906	The value specified for generated column 'v' in table 't1' ignored
+Warning	1906	The value specified for generated column 'v' in table 't1' has been ignored
 SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
 a	p	v	ROUND(a,p)	ROUND(a,p+NULL)
 1	0	1	1	NULL
@@ -302,15 +302,15 @@ d	varchar(5)	latin1_swedish_ci	YES		NULL	STORED GENERATED	#
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
 UPDATE IGNORE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';
 Warnings:
-Warning	1906	The value specified for generated column 'd' in table 't1' ignored
+Warning	1906	The value specified for generated column 'd' in table 't1' has been ignored
 INSERT IGNORE INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
 Warnings:
-Warning	1906	The value specified for generated column 'd' in table 't1' ignored
+Warning	1906	The value specified for generated column 'd' in table 't1' has been ignored
 set sql_mode='strict_all_tables';
 UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';
-ERROR HY000: The value specified for generated column 'd' in table 't1' ignored
+ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
-ERROR HY000: The value specified for generated column 'd' in table 't1' ignored
+ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored
 drop table t1;
 #
 # MDEV-5611: self-referencing virtual column
diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result
index be3ea8109cc..d6a8babc045 100644
--- a/mysql-test/suite/vcol/r/vcol_select_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result
@@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154);
 CREATE TABLE t2 (a int, b int AS (a) VIRTUAL);
 INSERT IGNORE INTO t2 VALUES (187,187), (9,9), (187,187);
 Warnings:
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
-Warning	1906	The value specified for generated column 'b' in table 't2' ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for generated column 'b' in table 't2' has been ignored
 EXPLAIN EXTENDED
 SELECT * FROM t1 JOIN t2 USING (b);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra