Merge 10.2 into 10.3

1 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/main/ctype_utf8mb4_heap.result b/mysql-test/main/ctype_utf8mb4_heap.result
index d82ed89be9c..85668451181 100644
--- a/mysql-test/main/ctype_utf8mb4_heap.result
+++ b/mysql-test/main/ctype_utf8mb4_heap.result
@@ -222,7 +222,7 @@ drop table t1;
 create table t1 (s1 char(10) character set utf8mb4) engine heap;
 insert ignore into t1 values (0x41FF);
 Warnings:
-Warning	1366	Incorrect string value: '\xFF' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
 select hex(s1) from t1;
 hex(s1)
 413F
@@ -230,7 +230,7 @@ drop table t1;
 create table t1 (s1 varchar(10) character set utf8mb4) engine heap;
 insert ignore into t1 values (0x41FF);
 Warnings:
-Warning	1366	Incorrect string value: '\xFF' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t1`.`s1` at row 1
 select hex(s1) from t1;
 hex(s1)
 413F
@@ -2160,7 +2160,7 @@ insert into t1 values (0xF0908080);
 insert into t1 values (0xF0BFBFBF);
 insert ignore into t1 values (0xF08F8080);
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
+Warning	1366	Incorrect string value: '\xF0\x8F\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
 select hex(utf8mb4) from t1;
 hex(utf8mb4)
 3F
@@ -2180,7 +2180,7 @@ insert into t1 values (0xF4808080);
 insert into t1 values (0xF48F8080);
 insert ignore into t1 values (0xF4908080);
 Warnings:
-Warning	1366	Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
+Warning	1366	Incorrect string value: '\xF4\x90\x80\x80' for column `test`.`t1`.`utf8mb4` at row 1
 select hex(utf8mb4) from t1;
 hex(utf8mb4)
 3F
@@ -2255,7 +2255,7 @@ u_decimal	hex(utf8mb4_encoding)
 917999	F3A087AF
 INSERT IGNORE INTO t1 VALUES (1114111, x'f5808080');
 Warnings:
-Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column 'utf8mb4_encoding' at row 1
+Warning	1366	Incorrect string value: '\xF5\x80\x80\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
 SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
 table_name= 't1' AND column_name= 'utf8mb4_encoding';
 character_maximum_length	character_octet_length
@@ -2269,14 +2269,14 @@ INSERT INTO t2 VALUES (42856, x'ea9da8');
 INSERT INTO t2 VALUES (65131, x'efb9ab');
 INSERT IGNORE INTO t2 VALUES (1114111, x'f48fbfbf');
 Warnings:
-Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb3_encoding' at row 1
+Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t2`.`utf8mb3_encoding` at row 1
 SELECT character_maximum_length, character_octet_length FROM information_schema.columns WHERE
 table_name= 't2' AND column_name= 'utf8mb3_encoding';
 character_maximum_length	character_octet_length
 10	30
 UPDATE IGNORE t2 SET utf8mb3_encoding= x'f48fbfbd' where u_decimal= 42856;
 Warnings:
-Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBD' for column 'utf8mb3_encoding' at row 1
+Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBD' for column `test`.`t2`.`utf8mb3_encoding` at row 1
 UPDATE t2 SET utf8mb3_encoding= _utf8mb4 x'ea9da8' where u_decimal= 42856;
 SELECT HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8')) FROM t1;
 HEX(CONCAT(utf8mb4_encoding, _utf8 x'ea9da8'))