Merge 10.3 into 10.4

67 files changed, 1297 insertions, 1272 deletions

diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index a91650eb700..92946b65e66 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -752,12 +752,12 @@ create table t1(f1 int);
 alter table t1 add column f2 datetime not null, add column f21 date not null;
 insert into t1 values(1,'2000-01-01','2000-01-01');
 alter table t1 add column f3 datetime not null;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`f3` at row 1
 alter table t1 add column f3 date not null;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f3` at row 1
 alter table t1 add column f4 datetime not null default '2002-02-02',
 add column f41 date not null;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f41` at row 1
 alter table t1 add column f4 datetime not null default '2002-02-02',
 add column f41 date not null default '2002-02-02';
 select * from t1;
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result
index 5065d887500..ea9014498e0 100644
--- a/mysql-test/main/create.result
+++ b/mysql-test/main/create.result
@@ -1164,7 +1164,7 @@ INSERT INTO t3 VALUES (0);
 SET sql_mode = TRADITIONAL;
 
 ALTER TABLE t3 ADD INDEX(c1);
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t3`.`c1` at row 1
 
 # -- Cleanup.
 SET sql_mode = '';
@@ -1722,12 +1722,12 @@ NULL	0000-00-00	0000-00-00
 drop table t1;
 set @@session.sql_mode='STRICT_ALL_TABLES';
 create table if not exists t1 (a int, b date, c date) select 1 as b, 2 as c;
-ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
+ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 create table if not exists t1 (a int, b date, c date) 
 replace select 1 as b, 2 as c;
-ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
+ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
 select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
 create table if not exists t1 (a int, b date, c date) 
diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result
index 2db4da51667..f61fc4c8400 100644
--- a/mysql-test/main/ctype_big5.result
+++ b/mysql-test/main/ctype_big5.result
@@ -565,70 +565,70 @@ COUNT(*)
 28672
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1 WHERE a<>'?';
 COUNT(*)
 13973
diff --git a/mysql-test/main/ctype_cp932_binlog_stm.result b/mysql-test/main/ctype_cp932_binlog_stm.result
index f49400b63ff..089820d628a 100644
--- a/mysql-test/main/ctype_cp932_binlog_stm.result
+++ b/mysql-test/main/ctype_cp932_binlog_stm.result
@@ -98,70 +98,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 14623
diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result
index 507d0021a1f..be341cc7e68 100644
--- a/mysql-test/main/ctype_eucjpms.result
+++ b/mysql-test/main/ctype_eucjpms.result
@@ -10042,70 +10042,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 56959
diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result
index cc50ddd20be..3006e77412a 100644
--- a/mysql-test/main/ctype_euckr.result
+++ b/mysql-test/main/ctype_euckr.result
@@ -389,22 +389,22 @@ insert into t1 values (0xA181);
 insert into t1 values (0xA1FE);
 insert ignore into t1 values (0xA140);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1@' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1@' for column `test`.`t1`.`s1` at row 1
 insert ignore into t1 values (0xA15B);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1[' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1[' for column `test`.`t1`.`s1` at row 1
 insert ignore into t1 values (0xA160);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1`' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1`' for column `test`.`t1`.`s1` at row 1
 insert ignore into t1 values (0xA17B);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1{' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1{' for column `test`.`t1`.`s1` at row 1
 insert ignore into t1 values (0xA180);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1\x80' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1\x80' for column `test`.`t1`.`s1` at row 1
 insert ignore into t1 values (0xA1FF);
 Warnings:
-Warning	1366	Incorrect string value: '\xA1\xFF' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xA1\xFF' for column `test`.`t1`.`s1` at row 1
 select hex(s1), hex(convert(s1 using utf8)) from t1 order by binary s1;
 hex(s1)	hex(convert(s1 using utf8))
 3F3F	3F3F
@@ -24428,70 +24428,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1 WHERE a<>'?';
 COUNT(*)
 22428
diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result
index c3c2eee9b1c..8a0950caea8 100644
--- a/mysql-test/main/ctype_gb2312.result
+++ b/mysql-test/main/ctype_gb2312.result
@@ -489,70 +489,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1 WHERE a<>'?';
 COUNT(*)
 8178
diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result
index 4515b9fbdbf..9bf69584725 100644
--- a/mysql-test/main/ctype_gbk.result
+++ b/mysql-test/main/ctype_gbk.result
@@ -515,70 +515,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1 WHERE a<>'?';
 COUNT(*)
 23940
@@ -5196,25 +5196,25 @@ INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2
 WHERE type1='tail' OR type1='bad' OR type2='bad'
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x80@' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x80\x80' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x80\x81' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\x80\xA1@' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x80\xFE@' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x80\xFF' for column 'c' at row 8
-Warning	1366	Incorrect string value: '\x81\xFF' for column 'c' at row 9
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 10
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 11
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 12
-Warning	1366	Incorrect string value: '\xFF@' for column 'c' at row 13
-Warning	1366	Incorrect string value: '\xFF\x80' for column 'c' at row 14
-Warning	1366	Incorrect string value: '\xFF\x81' for column 'c' at row 15
-Warning	1366	Incorrect string value: '\xFF\xA1@' for column 'c' at row 16
-Warning	1366	Incorrect string value: '\xFF\xA1\xA3' for column 'c' at row 17
-Warning	1366	Incorrect string value: '\xFF\xFE@' for column 'c' at row 18
-Warning	1366	Incorrect string value: '\xFF\xFF' for column 'c' at row 19
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x80\xFF' for column `test`.`t3`.`c` at row 8
+Warning	1366	Incorrect string value: '\x81\xFF' for column `test`.`t3`.`c` at row 9
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 10
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 11
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 12
+Warning	1366	Incorrect string value: '\xFF@' for column `test`.`t3`.`c` at row 13
+Warning	1366	Incorrect string value: '\xFF\x80' for column `test`.`t3`.`c` at row 14
+Warning	1366	Incorrect string value: '\xFF\x81' for column `test`.`t3`.`c` at row 15
+Warning	1366	Incorrect string value: '\xFF\xA1@' for column `test`.`t3`.`c` at row 16
+Warning	1366	Incorrect string value: '\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 17
+Warning	1366	Incorrect string value: '\xFF\xFE@' for column `test`.`t3`.`c` at row 18
+Warning	1366	Incorrect string value: '\xFF\xFF' for column `test`.`t3`.`c` at row 19
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 19
@@ -5252,14 +5252,14 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1))
 AND (FIND_IN_SET('tail',type2) AND NOT FIND_IN_SET('ascii',type2))
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 8
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 8
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 8
@@ -5282,7 +5282,7 @@ DELETE FROM t3;
 #
 INSERT INTO t3 (b,c,comment) SELECT b,b,comment FROM t2 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 5
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 5
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 6
@@ -5405,70 +5405,70 @@ INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2
 WHERE type1='tail' OR type1='bad' OR type2='bad' OR type3='bad'
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x80\xFF' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x81\xFF' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\xFF@' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\xFF\x80' for column 'c' at row 8
-Warning	1366	Incorrect string value: '\xFF\x81' for column 'c' at row 9
-Warning	1366	Incorrect string value: '\xFF\xA1@' for column 'c' at row 10
-Warning	1366	Incorrect string value: '\xFF\xA1\xA3' for column 'c' at row 11
-Warning	1366	Incorrect string value: '\xFF\xFE@' for column 'c' at row 12
-Warning	1366	Incorrect string value: '\xFF\xFF' for column 'c' at row 13
-Warning	1366	Incorrect string value: '\x80@@' for column 'c' at row 14
-Warning	1366	Incorrect string value: '\x80@\x80' for column 'c' at row 15
-Warning	1366	Incorrect string value: '\x80@\x81' for column 'c' at row 16
-Warning	1366	Incorrect string value: '\x80@\xA1@' for column 'c' at row 17
-Warning	1366	Incorrect string value: '\x80@\xA1\xA3' for column 'c' at row 18
-Warning	1366	Incorrect string value: '\x80@\xFE@' for column 'c' at row 19
-Warning	1366	Incorrect string value: '\x80@\xFF' for column 'c' at row 20
-Warning	1366	Incorrect string value: '\x80\x80@' for column 'c' at row 21
-Warning	1366	Incorrect string value: '\x80\x80\x80' for column 'c' at row 22
-Warning	1366	Incorrect string value: '\x80\x80\x81' for column 'c' at row 23
-Warning	1366	Incorrect string value: '\x80\x80\xA1@' for column 'c' at row 24
-Warning	1366	Incorrect string value: '\x80\x80\xA1\xA3' for column 'c' at row 25
-Warning	1366	Incorrect string value: '\x80\x80\xFE@' for column 'c' at row 26
-Warning	1366	Incorrect string value: '\x80\x80\xFF' for column 'c' at row 27
-Warning	1366	Incorrect string value: '\x80\x81@' for column 'c' at row 28
-Warning	1366	Incorrect string value: '\x80\x81\x80' for column 'c' at row 29
-Warning	1366	Incorrect string value: '\x80\x81\x81' for column 'c' at row 30
-Warning	1366	Incorrect string value: '\x80\x81\xA1@' for column 'c' at row 31
-Warning	1366	Incorrect string value: '\x80\x81\xA1\xA3' for column 'c' at row 32
-Warning	1366	Incorrect string value: '\x80\x81\xFE@' for column 'c' at row 33
-Warning	1366	Incorrect string value: '\x80\x81\xFF' for column 'c' at row 34
-Warning	1366	Incorrect string value: '\x80\xA1@@' for column 'c' at row 35
-Warning	1366	Incorrect string value: '\x80\xA1@\x80' for column 'c' at row 36
-Warning	1366	Incorrect string value: '\x80\xA1@\x81' for column 'c' at row 37
-Warning	1366	Incorrect string value: '\x80\xA1@\xA1@' for column 'c' at row 38
-Warning	1366	Incorrect string value: '\x80\xA1@\xA1\xA3' for column 'c' at row 39
-Warning	1366	Incorrect string value: '\x80\xA1@\xFE@' for column 'c' at row 40
-Warning	1366	Incorrect string value: '\x80\xA1@\xFF' for column 'c' at row 41
-Warning	1366	Incorrect string value: '\x80\xA1\xA3@' for column 'c' at row 42
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\x80' for column 'c' at row 43
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\x81' for column 'c' at row 44
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\xA1@' for column 'c' at row 45
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\xA1\xA3' for column 'c' at row 46
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\xFE@' for column 'c' at row 47
-Warning	1366	Incorrect string value: '\x80\xA1\xA3\xFF' for column 'c' at row 48
-Warning	1366	Incorrect string value: '\x80\xFE@@' for column 'c' at row 49
-Warning	1366	Incorrect string value: '\x80\xFE@\x80' for column 'c' at row 50
-Warning	1366	Incorrect string value: '\x80\xFE@\x81' for column 'c' at row 51
-Warning	1366	Incorrect string value: '\x80\xFE@\xA1@' for column 'c' at row 52
-Warning	1366	Incorrect string value: '\x80\xFE@\xA1\xA3' for column 'c' at row 53
-Warning	1366	Incorrect string value: '\x80\xFE@\xFE@' for column 'c' at row 54
-Warning	1366	Incorrect string value: '\x80\xFE@\xFF' for column 'c' at row 55
-Warning	1366	Incorrect string value: '\x80\xFF@' for column 'c' at row 56
-Warning	1366	Incorrect string value: '\x80\xFF\x80' for column 'c' at row 57
-Warning	1366	Incorrect string value: '\x80\xFF\x81' for column 'c' at row 58
-Warning	1366	Incorrect string value: '\x80\xFF\xA1@' for column 'c' at row 59
-Warning	1366	Incorrect string value: '\x80\xFF\xA1\xA3' for column 'c' at row 60
-Warning	1366	Incorrect string value: '\x80\xFF\xFE@' for column 'c' at row 61
-Warning	1366	Incorrect string value: '\x80\xFF\xFF' for column 'c' at row 62
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 63
-Warning	1366	Incorrect string value: '\xFF' for column 'c' at row 64
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x80\xFF' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x81\xFF' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\xFF@' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\xFF\x80' for column `test`.`t3`.`c` at row 8
+Warning	1366	Incorrect string value: '\xFF\x81' for column `test`.`t3`.`c` at row 9
+Warning	1366	Incorrect string value: '\xFF\xA1@' for column `test`.`t3`.`c` at row 10
+Warning	1366	Incorrect string value: '\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 11
+Warning	1366	Incorrect string value: '\xFF\xFE@' for column `test`.`t3`.`c` at row 12
+Warning	1366	Incorrect string value: '\xFF\xFF' for column `test`.`t3`.`c` at row 13
+Warning	1366	Incorrect string value: '\x80@@' for column `test`.`t3`.`c` at row 14
+Warning	1366	Incorrect string value: '\x80@\x80' for column `test`.`t3`.`c` at row 15
+Warning	1366	Incorrect string value: '\x80@\x81' for column `test`.`t3`.`c` at row 16
+Warning	1366	Incorrect string value: '\x80@\xA1@' for column `test`.`t3`.`c` at row 17
+Warning	1366	Incorrect string value: '\x80@\xA1\xA3' for column `test`.`t3`.`c` at row 18
+Warning	1366	Incorrect string value: '\x80@\xFE@' for column `test`.`t3`.`c` at row 19
+Warning	1366	Incorrect string value: '\x80@\xFF' for column `test`.`t3`.`c` at row 20
+Warning	1366	Incorrect string value: '\x80\x80@' for column `test`.`t3`.`c` at row 21
+Warning	1366	Incorrect string value: '\x80\x80\x80' for column `test`.`t3`.`c` at row 22
+Warning	1366	Incorrect string value: '\x80\x80\x81' for column `test`.`t3`.`c` at row 23
+Warning	1366	Incorrect string value: '\x80\x80\xA1@' for column `test`.`t3`.`c` at row 24
+Warning	1366	Incorrect string value: '\x80\x80\xA1\xA3' for column `test`.`t3`.`c` at row 25
+Warning	1366	Incorrect string value: '\x80\x80\xFE@' for column `test`.`t3`.`c` at row 26
+Warning	1366	Incorrect string value: '\x80\x80\xFF' for column `test`.`t3`.`c` at row 27
+Warning	1366	Incorrect string value: '\x80\x81@' for column `test`.`t3`.`c` at row 28
+Warning	1366	Incorrect string value: '\x80\x81\x80' for column `test`.`t3`.`c` at row 29
+Warning	1366	Incorrect string value: '\x80\x81\x81' for column `test`.`t3`.`c` at row 30
+Warning	1366	Incorrect string value: '\x80\x81\xA1@' for column `test`.`t3`.`c` at row 31
+Warning	1366	Incorrect string value: '\x80\x81\xA1\xA3' for column `test`.`t3`.`c` at row 32
+Warning	1366	Incorrect string value: '\x80\x81\xFE@' for column `test`.`t3`.`c` at row 33
+Warning	1366	Incorrect string value: '\x80\x81\xFF' for column `test`.`t3`.`c` at row 34
+Warning	1366	Incorrect string value: '\x80\xA1@@' for column `test`.`t3`.`c` at row 35
+Warning	1366	Incorrect string value: '\x80\xA1@\x80' for column `test`.`t3`.`c` at row 36
+Warning	1366	Incorrect string value: '\x80\xA1@\x81' for column `test`.`t3`.`c` at row 37
+Warning	1366	Incorrect string value: '\x80\xA1@\xA1@' for column `test`.`t3`.`c` at row 38
+Warning	1366	Incorrect string value: '\x80\xA1@\xA1\xA3' for column `test`.`t3`.`c` at row 39
+Warning	1366	Incorrect string value: '\x80\xA1@\xFE@' for column `test`.`t3`.`c` at row 40
+Warning	1366	Incorrect string value: '\x80\xA1@\xFF' for column `test`.`t3`.`c` at row 41
+Warning	1366	Incorrect string value: '\x80\xA1\xA3@' for column `test`.`t3`.`c` at row 42
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\x80' for column `test`.`t3`.`c` at row 43
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\x81' for column `test`.`t3`.`c` at row 44
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\xA1@' for column `test`.`t3`.`c` at row 45
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\xA1\xA3' for column `test`.`t3`.`c` at row 46
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\xFE@' for column `test`.`t3`.`c` at row 47
+Warning	1366	Incorrect string value: '\x80\xA1\xA3\xFF' for column `test`.`t3`.`c` at row 48
+Warning	1366	Incorrect string value: '\x80\xFE@@' for column `test`.`t3`.`c` at row 49
+Warning	1366	Incorrect string value: '\x80\xFE@\x80' for column `test`.`t3`.`c` at row 50
+Warning	1366	Incorrect string value: '\x80\xFE@\x81' for column `test`.`t3`.`c` at row 51
+Warning	1366	Incorrect string value: '\x80\xFE@\xA1@' for column `test`.`t3`.`c` at row 52
+Warning	1366	Incorrect string value: '\x80\xFE@\xA1\xA3' for column `test`.`t3`.`c` at row 53
+Warning	1366	Incorrect string value: '\x80\xFE@\xFE@' for column `test`.`t3`.`c` at row 54
+Warning	1366	Incorrect string value: '\x80\xFE@\xFF' for column `test`.`t3`.`c` at row 55
+Warning	1366	Incorrect string value: '\x80\xFF@' for column `test`.`t3`.`c` at row 56
+Warning	1366	Incorrect string value: '\x80\xFF\x80' for column `test`.`t3`.`c` at row 57
+Warning	1366	Incorrect string value: '\x80\xFF\x81' for column `test`.`t3`.`c` at row 58
+Warning	1366	Incorrect string value: '\x80\xFF\xA1@' for column `test`.`t3`.`c` at row 59
+Warning	1366	Incorrect string value: '\x80\xFF\xA1\xA3' for column `test`.`t3`.`c` at row 60
+Warning	1366	Incorrect string value: '\x80\xFF\xFE@' for column `test`.`t3`.`c` at row 61
+Warning	1366	Incorrect string value: '\x80\xFF\xFF' for column `test`.`t3`.`c` at row 62
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 63
+Warning	1366	Incorrect string value: '\xFF' for column `test`.`t3`.`c` at row 64
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 163
@@ -5650,30 +5650,30 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1))
 AND type2='tail'
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\x80@' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x80\x80' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x80\x81' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x80\xA1@' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x80\xFE@' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x80@' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x80\x80' for column 'c' at row 8
-Warning	1366	Incorrect string value: '\x80\x81' for column 'c' at row 9
-Warning	1366	Incorrect string value: '\x80\xA1@' for column 'c' at row 10
-Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 11
-Warning	1366	Incorrect string value: '\x80\xFE@' for column 'c' at row 12
-Warning	1366	Incorrect string value: '\x80@' for column 'c' at row 13
-Warning	1366	Incorrect string value: '\x80\x80' for column 'c' at row 14
-Warning	1366	Incorrect string value: '\x80\x81' for column 'c' at row 15
-Warning	1366	Incorrect string value: '\x80\xA1@' for column 'c' at row 16
-Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 17
-Warning	1366	Incorrect string value: '\x80\xFE@' for column 'c' at row 18
-Warning	1366	Incorrect string value: '\x80@' for column 'c' at row 19
-Warning	1366	Incorrect string value: '\x80\x80' for column 'c' at row 20
-Warning	1366	Incorrect string value: '\x80\x81' for column 'c' at row 21
-Warning	1366	Incorrect string value: '\x80\xA1@' for column 'c' at row 22
-Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column 'c' at row 23
-Warning	1366	Incorrect string value: '\x80\xFE@' for column 'c' at row 24
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 8
+Warning	1366	Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 9
+Warning	1366	Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 10
+Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 11
+Warning	1366	Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 12
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 13
+Warning	1366	Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 14
+Warning	1366	Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 15
+Warning	1366	Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 16
+Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 17
+Warning	1366	Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 18
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t3`.`c` at row 19
+Warning	1366	Incorrect string value: '\x80\x80' for column `test`.`t3`.`c` at row 20
+Warning	1366	Incorrect string value: '\x80\x81' for column `test`.`t3`.`c` at row 21
+Warning	1366	Incorrect string value: '\x80\xA1@' for column `test`.`t3`.`c` at row 22
+Warning	1366	Incorrect string value: '\x80\xA1\xA3' for column `test`.`t3`.`c` at row 23
+Warning	1366	Incorrect string value: '\x80\xFE@' for column `test`.`t3`.`c` at row 24
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 24
@@ -5717,22 +5717,22 @@ WHERE (FIND_IN_SET('mb2',type1) OR FIND_IN_SET('ascii',type1)) AND
 type3='tail'
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 8
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 9
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 10
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 11
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 12
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 13
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 14
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 15
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 16
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 8
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 9
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 10
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 11
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 12
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 13
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 14
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 15
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 16
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 16
@@ -5768,15 +5768,15 @@ AND NOT FIND_IN_SET('ascii',type3)
 AND NOT FIND_IN_SET('mb2',type3)
 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 2
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 4
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 8
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 9
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 2
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 4
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 8
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 9
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 9
@@ -5852,28 +5852,28 @@ DELETE FROM t2 WHERE b IN (SELECT b FROM t3);
 DELETE FROM t3;
 INSERT IGNORE INTO t3 (b,c,comment) SELECT b,b,comment FROM t2 ORDER BY b;
 Warnings:
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 1
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 3
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 5
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 6
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 7
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 9
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 10
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 12
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 13
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 15
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 16
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 18
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 19
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 27
-Warning	1366	Incorrect string value: '\x80' for column 'c' at row 30
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 31
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 35
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 37
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 39
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 41
-Warning	1366	Incorrect string value: '\x81' for column 'c' at row 43
-Warning	1366	Incorrect string value: '\xA3' for column 'c' at row 45
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 1
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 3
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 5
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 6
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 7
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 9
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 10
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 12
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 13
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 15
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 16
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 18
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 19
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 27
+Warning	1366	Incorrect string value: '\x80' for column `test`.`t3`.`c` at row 30
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 31
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 35
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 37
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 39
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 41
+Warning	1366	Incorrect string value: '\x81' for column `test`.`t3`.`c` at row 43
+Warning	1366	Incorrect string value: '\xA3' for column `test`.`t3`.`c` at row 45
 SELECT COUNT(*) FROM t3;
 COUNT(*)
 46
diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index 233fd85a2c4..705c719405b 100644
--- a/mysql-test/main/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
@@ -7987,12 +7987,12 @@ SET NAMES utf8;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1);
 INSERT IGNORE INTO t1 VALUES ('Â'),('Â#');
 Warnings:
-Warning	1366	Incorrect string value: '\xC2' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xC2#' for column 'a' at row 2
+Warning	1366	Incorrect string value: '\xC2' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xC2#' for column `test`.`t1`.`a` at row 2
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1366	Incorrect string value: '\xC2' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xC2#' for column 'a' at row 2
+Warning	1366	Incorrect string value: '\xC2' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xC2#' for column `test`.`t1`.`a` at row 2
 SELECT HEX(a),a FROM t1;
 HEX(a)	a
 3F	?
diff --git a/mysql-test/main/ctype_many.result b/mysql-test/main/ctype_many.result
index d73a478b0c0..25802af4b5d 100644
--- a/mysql-test/main/ctype_many.result
+++ b/mysql-test/main/ctype_many.result
@@ -1767,8 +1767,8 @@ CREATE TABLE t2 (a VARCHAR(10) CHARACTER SET ucs2);
 INSERT INTO t1 VALUES (0x10082), (0x12345);
 INSERT IGNORE INTO t2 SELECT * FROM t1;
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x01\x00\x82' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x00\x01\x23\x45' for column 'a' at row 2
+Warning	1366	Incorrect string value: '\x00\x01\x00\x82' for column `test`.`t2`.`a` at row 1
+Warning	1366	Incorrect string value: '\x00\x01\x23\x45' for column `test`.`t2`.`a` at row 2
 SELECT HEX(a) FROM t2;
 HEX(a)
 003F
diff --git a/mysql-test/main/ctype_recoding.result b/mysql-test/main/ctype_recoding.result
index 806d9dc6997..4668ddf9684 100644
--- a/mysql-test/main/ctype_recoding.result
+++ b/mysql-test/main/ctype_recoding.result
@@ -171,8 +171,8 @@ create table t1 (a char(10) character set koi8r, b text character set koi8r);
 insert into t1 values ('test','test');
 insert ignore into t1 values ('ÊÃÕË','ÊÃÕË');
 Warnings:
-Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column 'b' at row 1
+Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xCA\xC3\xD5\xCB' for column `test`.`t1`.`b` at row 1
 drop table t1;
 set names koi8r;
 create table t1 (a char(10) character set cp1251);
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index c19a0008e11..090bb12fc42 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -412,70 +412,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 14623
diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result
index 88fba0b3973..7394ec82924 100644
--- a/mysql-test/main/ctype_uca.result
+++ b/mysql-test/main/ctype_uca.result
@@ -6743,13 +6743,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -6766,21 +6766,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -6824,7 +6824,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -6845,13 +6845,13 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 ch
 a
@@ -6872,7 +6872,7 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
@@ -6884,23 +6884,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 ALTER TABLE t1 DROP KEY ch;
 # 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
 SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -6987,13 +6987,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -7010,21 +7010,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
diff --git a/mysql-test/main/ctype_uca_innodb.result b/mysql-test/main/ctype_uca_innodb.result
index c04a99c8cd3..bd6f3b8a21f 100644
--- a/mysql-test/main/ctype_uca_innodb.result
+++ b/mysql-test/main/ctype_uca_innodb.result
@@ -24,13 +24,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -47,21 +47,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -105,7 +105,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -126,13 +126,13 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 ch
 a
@@ -153,7 +153,7 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
@@ -165,23 +165,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 ALTER TABLE t1 DROP KEY ch;
 # 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
 SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result
index c2411ff6898..efd113e4847 100644
--- a/mysql-test/main/ctype_ucs.result
+++ b/mysql-test/main/ctype_ucs.result
@@ -5409,7 +5409,7 @@ ERROR 22003: Out of range value for column 'a' at row 1
 SET sql_mode=DEFAULT;
 INSERT IGNORE INTO t1 VALUES (CONVERT('aaa' USING ucs2));
 Warnings:
-Warning	1366	Incorrect decimal value: 'aaa' for column 'a' at row 1
+Warning	1366	Incorrect decimal value: 'aaa' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 #
 # End of 5.6 tests
diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result
index 0b1cf606f0b..a1fcce33bbb 100644
--- a/mysql-test/main/ctype_ujis.result
+++ b/mysql-test/main/ctype_ujis.result
@@ -2571,70 +2571,70 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
 Warnings:
-Warning	1366	Incorrect string value: '\x80 ' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\x80!' for column 'a' at row 2
-Warning	1366	Incorrect string value: '\x80"' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\x80#' for column 'a' at row 4
-Warning	1366	Incorrect string value: '\x80$' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\x80%' for column 'a' at row 6
-Warning	1366	Incorrect string value: '\x80&' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\x80'' for column 'a' at row 8
-Warning	1366	Incorrect string value: '\x80(' for column 'a' at row 9
-Warning	1366	Incorrect string value: '\x80)' for column 'a' at row 10
-Warning	1366	Incorrect string value: '\x80*' for column 'a' at row 11
-Warning	1366	Incorrect string value: '\x80+' for column 'a' at row 12
-Warning	1366	Incorrect string value: '\x80,' for column 'a' at row 13
-Warning	1366	Incorrect string value: '\x80-' for column 'a' at row 14
-Warning	1366	Incorrect string value: '\x80.' for column 'a' at row 15
-Warning	1366	Incorrect string value: '\x80/' for column 'a' at row 16
-Warning	1366	Incorrect string value: '\x800' for column 'a' at row 17
-Warning	1366	Incorrect string value: '\x801' for column 'a' at row 18
-Warning	1366	Incorrect string value: '\x802' for column 'a' at row 19
-Warning	1366	Incorrect string value: '\x803' for column 'a' at row 20
-Warning	1366	Incorrect string value: '\x804' for column 'a' at row 21
-Warning	1366	Incorrect string value: '\x805' for column 'a' at row 22
-Warning	1366	Incorrect string value: '\x806' for column 'a' at row 23
-Warning	1366	Incorrect string value: '\x807' for column 'a' at row 24
-Warning	1366	Incorrect string value: '\x808' for column 'a' at row 25
-Warning	1366	Incorrect string value: '\x809' for column 'a' at row 26
-Warning	1366	Incorrect string value: '\x80:' for column 'a' at row 27
-Warning	1366	Incorrect string value: '\x80;' for column 'a' at row 28
-Warning	1366	Incorrect string value: '\x80<' for column 'a' at row 29
-Warning	1366	Incorrect string value: '\x80=' for column 'a' at row 30
-Warning	1366	Incorrect string value: '\x80>' for column 'a' at row 31
-Warning	1366	Incorrect string value: '\x80?' for column 'a' at row 32
-Warning	1366	Incorrect string value: '\x80@' for column 'a' at row 33
-Warning	1366	Incorrect string value: '\x80A' for column 'a' at row 34
-Warning	1366	Incorrect string value: '\x80B' for column 'a' at row 35
-Warning	1366	Incorrect string value: '\x80C' for column 'a' at row 36
-Warning	1366	Incorrect string value: '\x80D' for column 'a' at row 37
-Warning	1366	Incorrect string value: '\x80E' for column 'a' at row 38
-Warning	1366	Incorrect string value: '\x80F' for column 'a' at row 39
-Warning	1366	Incorrect string value: '\x80G' for column 'a' at row 40
-Warning	1366	Incorrect string value: '\x80H' for column 'a' at row 41
-Warning	1366	Incorrect string value: '\x80I' for column 'a' at row 42
-Warning	1366	Incorrect string value: '\x80J' for column 'a' at row 43
-Warning	1366	Incorrect string value: '\x80K' for column 'a' at row 44
-Warning	1366	Incorrect string value: '\x80L' for column 'a' at row 45
-Warning	1366	Incorrect string value: '\x80M' for column 'a' at row 46
-Warning	1366	Incorrect string value: '\x80N' for column 'a' at row 47
-Warning	1366	Incorrect string value: '\x80O' for column 'a' at row 48
-Warning	1366	Incorrect string value: '\x80P' for column 'a' at row 49
-Warning	1366	Incorrect string value: '\x80Q' for column 'a' at row 50
-Warning	1366	Incorrect string value: '\x80R' for column 'a' at row 51
-Warning	1366	Incorrect string value: '\x80S' for column 'a' at row 52
-Warning	1366	Incorrect string value: '\x80T' for column 'a' at row 53
-Warning	1366	Incorrect string value: '\x80U' for column 'a' at row 54
-Warning	1366	Incorrect string value: '\x80V' for column 'a' at row 55
-Warning	1366	Incorrect string value: '\x80W' for column 'a' at row 56
-Warning	1366	Incorrect string value: '\x80X' for column 'a' at row 57
-Warning	1366	Incorrect string value: '\x80Y' for column 'a' at row 58
-Warning	1366	Incorrect string value: '\x80Z' for column 'a' at row 59
-Warning	1366	Incorrect string value: '\x80[' for column 'a' at row 60
-Warning	1366	Incorrect string value: '\x80\' for column 'a' at row 61
-Warning	1366	Incorrect string value: '\x80]' for column 'a' at row 62
-Warning	1366	Incorrect string value: '\x80^' for column 'a' at row 63
-Warning	1366	Incorrect string value: '\x80_' for column 'a' at row 64
+Warning	1366	Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
+Warning	1366	Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
+Warning	1366	Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
+Warning	1366	Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
+Warning	1366	Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
+Warning	1366	Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
+Warning	1366	Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
+Warning	1366	Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
+Warning	1366	Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
+Warning	1366	Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
+Warning	1366	Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
+Warning	1366	Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
+Warning	1366	Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
+Warning	1366	Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
+Warning	1366	Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
+Warning	1366	Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
+Warning	1366	Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
+Warning	1366	Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
+Warning	1366	Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
+Warning	1366	Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
+Warning	1366	Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
+Warning	1366	Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
+Warning	1366	Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
+Warning	1366	Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
+Warning	1366	Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
+Warning	1366	Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
+Warning	1366	Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
+Warning	1366	Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
+Warning	1366	Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
+Warning	1366	Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
+Warning	1366	Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
+Warning	1366	Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
+Warning	1366	Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
+Warning	1366	Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
+Warning	1366	Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
+Warning	1366	Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
+Warning	1366	Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
+Warning	1366	Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
+Warning	1366	Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
+Warning	1366	Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
+Warning	1366	Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
+Warning	1366	Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
+Warning	1366	Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
+Warning	1366	Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
+Warning	1366	Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
+Warning	1366	Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
+Warning	1366	Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
+Warning	1366	Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
+Warning	1366	Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
+Warning	1366	Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
+Warning	1366	Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
+Warning	1366	Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
+Warning	1366	Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
+Warning	1366	Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
+Warning	1366	Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 44671
diff --git a/mysql-test/main/ctype_ujis_ucs2.result b/mysql-test/main/ctype_ujis_ucs2.result
index 77961046346..cb501fd065f 100644
--- a/mysql-test/main/ctype_ujis_ucs2.result
+++ b/mysql-test/main/ctype_ujis_ucs2.result
@@ -1140,70 +1140,70 @@ update t1 set name='User defined range #2' where ujis >= 0x8FF5A1 and ujis <= 0x
 update t1 set name='UNASSIGNED' where name='';
 update ignore t1 set ucs2=ujis, ujis2=ucs2;
 Warnings:
-Warning	1366	Incorrect string value: '\xA2\xAF' for column 'ucs2' at row 237
-Warning	1366	Incorrect string value: '\xA2\xB0' for column 'ucs2' at row 238
-Warning	1366	Incorrect string value: '\xA2\xB1' for column 'ucs2' at row 239
-Warning	1366	Incorrect string value: '\xA2\xB2' for column 'ucs2' at row 240
-Warning	1366	Incorrect string value: '\xA2\xB3' for column 'ucs2' at row 241
-Warning	1366	Incorrect string value: '\xA2\xB4' for column 'ucs2' at row 242
-Warning	1366	Incorrect string value: '\xA2\xB5' for column 'ucs2' at row 243
-Warning	1366	Incorrect string value: '\xA2\xB6' for column 'ucs2' at row 244
-Warning	1366	Incorrect string value: '\xA2\xB7' for column 'ucs2' at row 245
-Warning	1366	Incorrect string value: '\xA2\xB8' for column 'ucs2' at row 246
-Warning	1366	Incorrect string value: '\xA2\xB9' for column 'ucs2' at row 247
-Warning	1366	Incorrect string value: '\xA2\xC2' for column 'ucs2' at row 256
-Warning	1366	Incorrect string value: '\xA2\xC3' for column 'ucs2' at row 257
-Warning	1366	Incorrect string value: '\xA2\xC4' for column 'ucs2' at row 258
-Warning	1366	Incorrect string value: '\xA2\xC5' for column 'ucs2' at row 259
-Warning	1366	Incorrect string value: '\xA2\xC6' for column 'ucs2' at row 260
-Warning	1366	Incorrect string value: '\xA2\xC7' for column 'ucs2' at row 261
-Warning	1366	Incorrect string value: '\xA2\xC8' for column 'ucs2' at row 262
-Warning	1366	Incorrect string value: '\xA2\xC9' for column 'ucs2' at row 263
-Warning	1366	Incorrect string value: '\xA2\xD1' for column 'ucs2' at row 271
-Warning	1366	Incorrect string value: '\xA2\xD2' for column 'ucs2' at row 272
-Warning	1366	Incorrect string value: '\xA2\xD3' for column 'ucs2' at row 273
-Warning	1366	Incorrect string value: '\xA2\xD4' for column 'ucs2' at row 274
-Warning	1366	Incorrect string value: '\xA2\xD5' for column 'ucs2' at row 275
-Warning	1366	Incorrect string value: '\xA2\xD6' for column 'ucs2' at row 276
-Warning	1366	Incorrect string value: '\xA2\xD7' for column 'ucs2' at row 277
-Warning	1366	Incorrect string value: '\xA2\xD8' for column 'ucs2' at row 278
-Warning	1366	Incorrect string value: '\xA2\xD9' for column 'ucs2' at row 279
-Warning	1366	Incorrect string value: '\xA2\xDA' for column 'ucs2' at row 280
-Warning	1366	Incorrect string value: '\xA2\xDB' for column 'ucs2' at row 281
-Warning	1366	Incorrect string value: '\xA2\xEB' for column 'ucs2' at row 297
-Warning	1366	Incorrect string value: '\xA2\xEC' for column 'ucs2' at row 298
-Warning	1366	Incorrect string value: '\xA2\xED' for column 'ucs2' at row 299
-Warning	1366	Incorrect string value: '\xA2\xEE' for column 'ucs2' at row 300
-Warning	1366	Incorrect string value: '\xA2\xEF' for column 'ucs2' at row 301
-Warning	1366	Incorrect string value: '\xA2\xF0' for column 'ucs2' at row 302
-Warning	1366	Incorrect string value: '\xA2\xF1' for column 'ucs2' at row 303
-Warning	1366	Incorrect string value: '\xA2\xFA' for column 'ucs2' at row 312
-Warning	1366	Incorrect string value: '\xA2\xFB' for column 'ucs2' at row 313
-Warning	1366	Incorrect string value: '\xA2\xFC' for column 'ucs2' at row 314
-Warning	1366	Incorrect string value: '\xA2\xFD' for column 'ucs2' at row 315
-Warning	1366	Incorrect string value: '\xA3\xA1' for column 'ucs2' at row 317
-Warning	1366	Incorrect string value: '\xA3\xA2' for column 'ucs2' at row 318
-Warning	1366	Incorrect string value: '\xA3\xA3' for column 'ucs2' at row 319
-Warning	1366	Incorrect string value: '\xA3\xA4' for column 'ucs2' at row 320
-Warning	1366	Incorrect string value: '\xA3\xA5' for column 'ucs2' at row 321
-Warning	1366	Incorrect string value: '\xA3\xA6' for column 'ucs2' at row 322
-Warning	1366	Incorrect string value: '\xA3\xA7' for column 'ucs2' at row 323
-Warning	1366	Incorrect string value: '\xA3\xA8' for column 'ucs2' at row 324
-Warning	1366	Incorrect string value: '\xA3\xA9' for column 'ucs2' at row 325
-Warning	1366	Incorrect string value: '\xA3\xAA' for column 'ucs2' at row 326
-Warning	1366	Incorrect string value: '\xA3\xAB' for column 'ucs2' at row 327
-Warning	1366	Incorrect string value: '\xA3\xAC' for column 'ucs2' at row 328
-Warning	1366	Incorrect string value: '\xA3\xAD' for column 'ucs2' at row 329
-Warning	1366	Incorrect string value: '\xA3\xAE' for column 'ucs2' at row 330
-Warning	1366	Incorrect string value: '\xA3\xAF' for column 'ucs2' at row 331
-Warning	1366	Incorrect string value: '\xA3\xBA' for column 'ucs2' at row 342
-Warning	1366	Incorrect string value: '\xA3\xBB' for column 'ucs2' at row 343
-Warning	1366	Incorrect string value: '\xA3\xBC' for column 'ucs2' at row 344
-Warning	1366	Incorrect string value: '\xA3\xBD' for column 'ucs2' at row 345
-Warning	1366	Incorrect string value: '\xA3\xBE' for column 'ucs2' at row 346
-Warning	1366	Incorrect string value: '\xA3\xBF' for column 'ucs2' at row 347
-Warning	1366	Incorrect string value: '\xA3\xC0' for column 'ucs2' at row 348
-Warning	1366	Incorrect string value: '\xA3\xDB' for column 'ucs2' at row 375
+Warning	1366	Incorrect string value: '\xA2\xAF' for column `test`.`t1`.`ucs2` at row 237
+Warning	1366	Incorrect string value: '\xA2\xB0' for column `test`.`t1`.`ucs2` at row 238
+Warning	1366	Incorrect string value: '\xA2\xB1' for column `test`.`t1`.`ucs2` at row 239
+Warning	1366	Incorrect string value: '\xA2\xB2' for column `test`.`t1`.`ucs2` at row 240
+Warning	1366	Incorrect string value: '\xA2\xB3' for column `test`.`t1`.`ucs2` at row 241
+Warning	1366	Incorrect string value: '\xA2\xB4' for column `test`.`t1`.`ucs2` at row 242
+Warning	1366	Incorrect string value: '\xA2\xB5' for column `test`.`t1`.`ucs2` at row 243
+Warning	1366	Incorrect string value: '\xA2\xB6' for column `test`.`t1`.`ucs2` at row 244
+Warning	1366	Incorrect string value: '\xA2\xB7' for column `test`.`t1`.`ucs2` at row 245
+Warning	1366	Incorrect string value: '\xA2\xB8' for column `test`.`t1`.`ucs2` at row 246
+Warning	1366	Incorrect string value: '\xA2\xB9' for column `test`.`t1`.`ucs2` at row 247
+Warning	1366	Incorrect string value: '\xA2\xC2' for column `test`.`t1`.`ucs2` at row 256
+Warning	1366	Incorrect string value: '\xA2\xC3' for column `test`.`t1`.`ucs2` at row 257
+Warning	1366	Incorrect string value: '\xA2\xC4' for column `test`.`t1`.`ucs2` at row 258
+Warning	1366	Incorrect string value: '\xA2\xC5' for column `test`.`t1`.`ucs2` at row 259
+Warning	1366	Incorrect string value: '\xA2\xC6' for column `test`.`t1`.`ucs2` at row 260
+Warning	1366	Incorrect string value: '\xA2\xC7' for column `test`.`t1`.`ucs2` at row 261
+Warning	1366	Incorrect string value: '\xA2\xC8' for column `test`.`t1`.`ucs2` at row 262
+Warning	1366	Incorrect string value: '\xA2\xC9' for column `test`.`t1`.`ucs2` at row 263
+Warning	1366	Incorrect string value: '\xA2\xD1' for column `test`.`t1`.`ucs2` at row 271
+Warning	1366	Incorrect string value: '\xA2\xD2' for column `test`.`t1`.`ucs2` at row 272
+Warning	1366	Incorrect string value: '\xA2\xD3' for column `test`.`t1`.`ucs2` at row 273
+Warning	1366	Incorrect string value: '\xA2\xD4' for column `test`.`t1`.`ucs2` at row 274
+Warning	1366	Incorrect string value: '\xA2\xD5' for column `test`.`t1`.`ucs2` at row 275
+Warning	1366	Incorrect string value: '\xA2\xD6' for column `test`.`t1`.`ucs2` at row 276
+Warning	1366	Incorrect string value: '\xA2\xD7' for column `test`.`t1`.`ucs2` at row 277
+Warning	1366	Incorrect string value: '\xA2\xD8' for column `test`.`t1`.`ucs2` at row 278
+Warning	1366	Incorrect string value: '\xA2\xD9' for column `test`.`t1`.`ucs2` at row 279
+Warning	1366	Incorrect string value: '\xA2\xDA' for column `test`.`t1`.`ucs2` at row 280
+Warning	1366	Incorrect string value: '\xA2\xDB' for column `test`.`t1`.`ucs2` at row 281
+Warning	1366	Incorrect string value: '\xA2\xEB' for column `test`.`t1`.`ucs2` at row 297
+Warning	1366	Incorrect string value: '\xA2\xEC' for column `test`.`t1`.`ucs2` at row 298
+Warning	1366	Incorrect string value: '\xA2\xED' for column `test`.`t1`.`ucs2` at row 299
+Warning	1366	Incorrect string value: '\xA2\xEE' for column `test`.`t1`.`ucs2` at row 300
+Warning	1366	Incorrect string value: '\xA2\xEF' for column `test`.`t1`.`ucs2` at row 301
+Warning	1366	Incorrect string value: '\xA2\xF0' for column `test`.`t1`.`ucs2` at row 302
+Warning	1366	Incorrect string value: '\xA2\xF1' for column `test`.`t1`.`ucs2` at row 303
+Warning	1366	Incorrect string value: '\xA2\xFA' for column `test`.`t1`.`ucs2` at row 312
+Warning	1366	Incorrect string value: '\xA2\xFB' for column `test`.`t1`.`ucs2` at row 313
+Warning	1366	Incorrect string value: '\xA2\xFC' for column `test`.`t1`.`ucs2` at row 314
+Warning	1366	Incorrect string value: '\xA2\xFD' for column `test`.`t1`.`ucs2` at row 315
+Warning	1366	Incorrect string value: '\xA3\xA1' for column `test`.`t1`.`ucs2` at row 317
+Warning	1366	Incorrect string value: '\xA3\xA2' for column `test`.`t1`.`ucs2` at row 318
+Warning	1366	Incorrect string value: '\xA3\xA3' for column `test`.`t1`.`ucs2` at row 319
+Warning	1366	Incorrect string value: '\xA3\xA4' for column `test`.`t1`.`ucs2` at row 320
+Warning	1366	Incorrect string value: '\xA3\xA5' for column `test`.`t1`.`ucs2` at row 321
+Warning	1366	Incorrect string value: '\xA3\xA6' for column `test`.`t1`.`ucs2` at row 322
+Warning	1366	Incorrect string value: '\xA3\xA7' for column `test`.`t1`.`ucs2` at row 323
+Warning	1366	Incorrect string value: '\xA3\xA8' for column `test`.`t1`.`ucs2` at row 324
+Warning	1366	Incorrect string value: '\xA3\xA9' for column `test`.`t1`.`ucs2` at row 325
+Warning	1366	Incorrect string value: '\xA3\xAA' for column `test`.`t1`.`ucs2` at row 326
+Warning	1366	Incorrect string value: '\xA3\xAB' for column `test`.`t1`.`ucs2` at row 327
+Warning	1366	Incorrect string value: '\xA3\xAC' for column `test`.`t1`.`ucs2` at row 328
+Warning	1366	Incorrect string value: '\xA3\xAD' for column `test`.`t1`.`ucs2` at row 329
+Warning	1366	Incorrect string value: '\xA3\xAE' for column `test`.`t1`.`ucs2` at row 330
+Warning	1366	Incorrect string value: '\xA3\xAF' for column `test`.`t1`.`ucs2` at row 331
+Warning	1366	Incorrect string value: '\xA3\xBA' for column `test`.`t1`.`ucs2` at row 342
+Warning	1366	Incorrect string value: '\xA3\xBB' for column `test`.`t1`.`ucs2` at row 343
+Warning	1366	Incorrect string value: '\xA3\xBC' for column `test`.`t1`.`ucs2` at row 344
+Warning	1366	Incorrect string value: '\xA3\xBD' for column `test`.`t1`.`ucs2` at row 345
+Warning	1366	Incorrect string value: '\xA3\xBE' for column `test`.`t1`.`ucs2` at row 346
+Warning	1366	Incorrect string value: '\xA3\xBF' for column `test`.`t1`.`ucs2` at row 347
+Warning	1366	Incorrect string value: '\xA3\xC0' for column `test`.`t1`.`ucs2` at row 348
+Warning	1366	Incorrect string value: '\xA3\xDB' for column `test`.`t1`.`ucs2` at row 375
 Characters with safe Unicode round trip
 select hex(ujis), hex(ucs2), hex(ujis2), name from t1 where ujis=ujis2 order by ujis;
 hex(ujis)	hex(ucs2)	hex(ujis2)	name
@@ -19131,17 +19131,17 @@ insert into t1 (ucs2,name) values (0xFFE2,'U+FFE2 FULLWIDTH NOT SIGN');
 insert into t1 (ucs2,name) values (0xFFE4,'U+FFE4 FULLWIDTH BROKEN BAR');
 update ignore t1 set ujis=ucs2;
 Warnings:
-Warning	1366	Incorrect string value: '\x00\xA5' for column 'ujis' at row 1
-Warning	1366	Incorrect string value: '\x20\x14' for column 'ujis' at row 2
-Warning	1366	Incorrect string value: '\x20\x3E' for column 'ujis' at row 3
-Warning	1366	Incorrect string value: '\x22\x25' for column 'ujis' at row 4
-Warning	1366	Incorrect string value: '\xFF\x0D' for column 'ujis' at row 5
-Warning	1366	Incorrect string value: '\xFF\x3C' for column 'ujis' at row 6
-Warning	1366	Incorrect string value: '\xFF\x5E' for column 'ujis' at row 7
-Warning	1366	Incorrect string value: '\xFF\xE0' for column 'ujis' at row 8
-Warning	1366	Incorrect string value: '\xFF\xE1' for column 'ujis' at row 9
-Warning	1366	Incorrect string value: '\xFF\xE2' for column 'ujis' at row 10
-Warning	1366	Incorrect string value: '\xFF\xE4' for column 'ujis' at row 11
+Warning	1366	Incorrect string value: '\x00\xA5' for column `test`.`t1`.`ujis` at row 1
+Warning	1366	Incorrect string value: '\x20\x14' for column `test`.`t1`.`ujis` at row 2
+Warning	1366	Incorrect string value: '\x20\x3E' for column `test`.`t1`.`ujis` at row 3
+Warning	1366	Incorrect string value: '\x22\x25' for column `test`.`t1`.`ujis` at row 4
+Warning	1366	Incorrect string value: '\xFF\x0D' for column `test`.`t1`.`ujis` at row 5
+Warning	1366	Incorrect string value: '\xFF\x3C' for column `test`.`t1`.`ujis` at row 6
+Warning	1366	Incorrect string value: '\xFF\x5E' for column `test`.`t1`.`ujis` at row 7
+Warning	1366	Incorrect string value: '\xFF\xE0' for column `test`.`t1`.`ujis` at row 8
+Warning	1366	Incorrect string value: '\xFF\xE1' for column `test`.`t1`.`ujis` at row 9
+Warning	1366	Incorrect string value: '\xFF\xE2' for column `test`.`t1`.`ujis` at row 10
+Warning	1366	Incorrect string value: '\xFF\xE4' for column `test`.`t1`.`ujis` at row 11
 select hex(ucs2),hex(ujis),name from t1 order by name;
 hex(ucs2)	hex(ujis)	name
 00A5	3F	U+00A5 YEN SIGN
diff --git a/mysql-test/main/ctype_utf16.result b/mysql-test/main/ctype_utf16.result
index a105017b726..fb7ae1f62bb 100644
--- a/mysql-test/main/ctype_utf16.result
+++ b/mysql-test/main/ctype_utf16.result
@@ -1015,7 +1015,7 @@ insert into t1 values (0xdf84);
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 alter table t1 modify column s1 varchar(50) character set utf16;
 Warnings:
-Warning	1366	Incorrect string value: '\xDF\x84' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s1` at row 1
 select hex(s1) from t1;
 hex(s1)
 003F
@@ -1024,7 +1024,7 @@ create table t1 (s1 varchar(5) character set ucs2, s2 varchar(5) character set u
 insert into t1 (s1) values (0xdf84);
 update ignore t1 set s2 = s1;
 Warnings:
-Warning	1366	Incorrect string value: '\xDF\x84' for column 's2' at row 1
+Warning	1366	Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s2` at row 1
 select hex(s2) from t1;
 hex(s2)
 003F
diff --git a/mysql-test/main/ctype_utf16le.result b/mysql-test/main/ctype_utf16le.result
index 6d8d7ddca2a..ba7a2383671 100644
--- a/mysql-test/main/ctype_utf16le.result
+++ b/mysql-test/main/ctype_utf16le.result
@@ -1124,7 +1124,7 @@ INSERT INTO t1 VALUES (0xDF84);
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 ALTER TABLE t1 MODIFY column s1 VARCHAR(50) CHARACTER SET utf16le;
 Warnings:
-Warning	1366	Incorrect string value: '\xDF\x84' for column 's1' at row 1
+Warning	1366	Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s1` at row 1
 SELECT HEX(s1) FROM t1;
 HEX(s1)
 3F00
@@ -1136,7 +1136,7 @@ CREATE TABLE t1 (s1 VARCHAR(5) CHARACTER SET ucs2, s2 VARCHAR(5) CHARACTER SET u
 INSERT INTO t1 (s1) VALUES (0xdf84);
 UPDATE IGNORE t1 set s2 = s1;
 Warnings:
-Warning	1366	Incorrect string value: '\xDF\x84' for column 's2' at row 1
+Warning	1366	Incorrect string value: '\xDF\x84' for column `test`.`t1`.`s2` at row 1
 SELECT HEX(s2) FROM t1;
 HEX(s2)
 3F00
diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result
index 28b9caf6ffe..47e739df290 100644
--- a/mysql-test/main/ctype_utf32.result
+++ b/mysql-test/main/ctype_utf32.result
@@ -985,31 +985,31 @@ create table t1 (utf32 varchar(2) character set utf32);
 Wrong character with pad
 insert ignore into t1 values (0x110000);
 Warnings:
-Warning	1366	Incorrect string value: '\x11\x00\x00' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
 Wrong chsaracter without pad
 insert ignore into t1 values (0x00110000);
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
 Wrong character with pad followed by another wrong character
 insert ignore into t1 values (0x11000000110000);
 Warnings:
-Warning	1366	Incorrect string value: '\x11\x00\x00\x00\x11\x00...' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x11\x00\x00\x00\x11\x00...' for column `test`.`t1`.`utf32` at row 1
 Good character with pad followed by bad character
 insert ignore into t1 values (0x10000000110000);
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
 Good character without pad followed by bad character
 insert ignore into t1 values (0x0010000000110000);
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x00\x11\x00\x00' for column `test`.`t1`.`utf32` at row 1
 Wrong character with the second byte higher than 0x10
 insert ignore into t1 values (0x00800037);
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x80\x007' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x00\x80\x007' for column `test`.`t1`.`utf32` at row 1
 Wrong character with pad with the second byte higher than 0x10
 insert ignore into t1 values (0x00800037);
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x80\x007' for column 'utf32' at row 1
+Warning	1366	Incorrect string value: '\x00\x80\x007' for column `test`.`t1`.`utf32` at row 1
 drop table t1;
 select _utf32'a' collate utf32_general_ci = 0xfffd;
 _utf32'a' collate utf32_general_ci = 0xfffd
@@ -1561,12 +1561,12 @@ CREATE TABLE t1 (utf32 CHAR(5) CHARACTER SET utf32, latin1 CHAR(5) CHARACTER SET
 INSERT INTO t1 (utf32) VALUES (0xc581);
 UPDATE IGNORE t1 SET latin1 = utf32;
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x00\xC5\x81' for column 'latin1' at row 1
+Warning	1366	Incorrect string value: '\x00\x00\xC5\x81' for column `test`.`t1`.`latin1` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (utf32) VALUES (0x100cc);
 UPDATE IGNORE t1 SET latin1 = utf32;
 Warnings:
-Warning	1366	Incorrect string value: '\x00\x01\x00\xCC' for column 'latin1' at row 1
+Warning	1366	Incorrect string value: '\x00\x01\x00\xCC' for column `test`.`t1`.`latin1` at row 1
 DROP TABLE t1;
 #
 # Bug#55912 FORMAT with locale set fails for numbers < 1000
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index d696ff78831..9c2fcb84765 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -222,7 +222,7 @@ drop table t1;
 create table t1 (s1 char(10) character set utf8);
 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 utf8);
 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
@@ -238,7 +238,7 @@ drop table t1;
 create table t1 (s1 text character set utf8);
 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
@@ -5456,13 +5456,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5479,21 +5479,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -5537,7 +5537,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -5558,13 +5558,13 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 ch
 a
@@ -5585,7 +5585,7 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
@@ -5597,23 +5597,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 ALTER TABLE t1 DROP KEY ch;
 # 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
 SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -5700,13 +5700,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5723,21 +5723,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -5781,7 +5781,7 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -5802,13 +5802,13 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch<'a𝌆b' ORDER BY ch;
 ch
 a
@@ -5829,7 +5829,7 @@ az
 aЀ
 aր
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
@@ -5841,23 +5841,23 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ch	ch	183	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch>'a𝌆b' ORDER BY ch;
 ch
 z
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 ALTER TABLE t1 DROP KEY ch;
 # 0xD18F would be a good 2-byte character, 0xD1 is an incomplete sequence
 SET @query=CONCAT('SELECT ch FROM t1 WHERE ch=''a', 0xD1,'''');
@@ -5944,13 +5944,13 @@ INSERT INTO t1 (ch) VALUES ('admin'),('admin1');
 SELECT ch FROM t1 WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch='admin𝌆';
 ch
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='admin𝌆';
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 DELETE FROM t1;
 INSERT INTO t1 (ch) VALUES ('a'), ('a?'), ('a??'), ('a???'), ('a????');
 INSERT INTO t1 (ch) VALUES ('ab'),('a?b'),('a??b'),('a???b'),('a????b');
@@ -5967,21 +5967,21 @@ SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86' for column `test`.`t1`.`ch` at row 1
 EXPLAIN
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	#	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 FORCE KEY (ch) WHERE ch='a𝌆b' ORDER BY ch;
 ch
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column 'ch' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x8C\x86b' for column `test`.`t1`.`ch` at row 1
 SELECT ch FROM t1 IGNORE KEY (ch) WHERE ch<'a𝌆' ORDER BY ch;
 ch
 a
@@ -10611,11 +10611,11 @@ DROP TABLE t1;
 CREATE TABLE t1 (a TEXT CHARACTER SET utf8);
 LOAD DATA INFILE '../../std_data/loaddata/mdev9823.utf8mb4.txt' IGNORE INTO TABLE t1 CHARACTER SET utf8 IGNORE 4 LINES;
 Warnings:
-Warning	1366	Incorrect string value: '\xD0' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xE1\x80' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 7
-Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 8
+Warning	1366	Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xE1\x80' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 8
 SELECT HEX(a) FROM t1;
 HEX(a)
 3F
@@ -10633,7 +10633,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a TEXT CHARACTER SET utf8);
 LOAD XML INFILE '../../std_data/loaddata/mdev9874.xml' IGNORE INTO TABLE t1 CHARACTER SET utf8 ROWS IDENTIFIED BY '<row>';
 Warnings:
-Warning	1366	Incorrect string value: '\xD0' for column 'a' at row 1
+Warning	1366	Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
 SELECT HEX(a) FROM t1;
 HEX(a)
 613F
diff --git a/mysql-test/main/ctype_utf8mb4.result b/mysql-test/main/ctype_utf8mb4.result
index 27ffd5552fa..fac15a5a2cd 100644
--- a/mysql-test/main/ctype_utf8mb4.result
+++ b/mysql-test/main/ctype_utf8mb4.result
@@ -222,7 +222,7 @@ drop table t1;
 create table t1 (s1 char(10) character set utf8mb4);
 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);
 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
@@ -238,7 +238,7 @@ drop table t1;
 create table t1 (s1 text character set utf8mb4);
 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
@@ -2328,7 +2328,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 order by binary utf8mb4;
 hex(utf8mb4)
 3F
@@ -2348,7 +2348,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 order by binary utf8mb4;
 hex(utf8mb4)
 3F
@@ -2442,7 +2442,7 @@ u_decimal	hex(utf8mb4_encoding)
 119070	F09D849EF09D859EF09D859EF09D8480F09D859FF09D859FF09D859FF09D85A0F09D85A0F09D8480
 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
@@ -2456,14 +2456,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'))
@@ -2524,17 +2524,17 @@ count(*)
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 ALTER TABLE t1 CONVERT TO CHARACTER SET utf8;
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9D\x84\x80' for column 'utf8mb4_encoding' at row 1
-Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E' for column 'utf8mb4_encoding' at row 2
-Warning	1366	Incorrect string value: '\xF0\x9D\x85\x9E' for column 'utf8mb4_encoding' at row 3
-Warning	1366	Incorrect string value: '\xF0\x9D\x87\x8F' for column 'utf8mb4_encoding' at row 4
-Warning	1366	Incorrect string value: '\xF0\x9D\x9C\x9F' for column 'utf8mb4_encoding' at row 5
-Warning	1366	Incorrect string value: '\xF0\x9D\x9E\x9F' for column 'utf8mb4_encoding' at row 6
-Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBF' for column 'utf8mb4_encoding' at row 7
-Warning	1366	Incorrect string value: '\xF3\xA0\x87\xAF' for column 'utf8mb4_encoding' at row 8
-Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 9
-Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 10
-Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column 'utf8mb4_encoding' at row 11
+Warning	1366	Incorrect string value: '\xF0\x9D\x84\x80' for column `test`.`t1`.`utf8mb4_encoding` at row 1
+Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E' for column `test`.`t1`.`utf8mb4_encoding` at row 2
+Warning	1366	Incorrect string value: '\xF0\x9D\x85\x9E' for column `test`.`t1`.`utf8mb4_encoding` at row 3
+Warning	1366	Incorrect string value: '\xF0\x9D\x87\x8F' for column `test`.`t1`.`utf8mb4_encoding` at row 4
+Warning	1366	Incorrect string value: '\xF0\x9D\x9C\x9F' for column `test`.`t1`.`utf8mb4_encoding` at row 5
+Warning	1366	Incorrect string value: '\xF0\x9D\x9E\x9F' for column `test`.`t1`.`utf8mb4_encoding` at row 6
+Warning	1366	Incorrect string value: '\xF4\x8F\xBF\xBF' for column `test`.`t1`.`utf8mb4_encoding` at row 7
+Warning	1366	Incorrect string value: '\xF3\xA0\x87\xAF' for column `test`.`t1`.`utf8mb4_encoding` at row 8
+Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 9
+Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 10
+Warning	1366	Incorrect string value: '\xF0\x9D\x84\x9E\xF0\x9D...' for column `test`.`t1`.`utf8mb4_encoding` at row 11
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -3427,8 +3427,8 @@ b VARCHAR(32) CHARACTER SET utf8
 );
 INSERT IGNORE INTO t1 SELECT 'a 😁 b', 'a 😁 b';
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'b' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`b` at row 1
 SELECT * FROM t1;
 a	b
 a ???? b	a ???? b
@@ -3447,7 +3447,7 @@ b VARCHAR(32) CHARACTER SET utf8
 );
 INSERT IGNORE INTO t1 SELECT 'a 😁 b', 'a 😁 b';
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column 'b' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81 b' for column `test`.`t1`.`b` at row 1
 SELECT * FROM t1;
 a	b
 a 😁 b	a ? b
@@ -3539,10 +3539,10 @@ DROP FUNCTION f1;
 CREATE TABLE t1 (a TEXT CHARACTER SET utf8mb4);
 LOAD DATA INFILE '../../std_data/loaddata/mdev9823.utf8mb4.txt' IGNORE INTO TABLE t1 CHARACTER SET utf8mb4 IGNORE 4 LINES;
 Warnings:
-Warning	1366	Incorrect string value: '\xD0' for column 'a' at row 1
-Warning	1366	Incorrect string value: '\xE1\x80' for column 'a' at row 3
-Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 5
-Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column 'a' at row 8
+Warning	1366	Incorrect string value: '\xD0' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect string value: '\xE1\x80' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect string value: '\xF0\x9F\x98' for column `test`.`t1`.`a` at row 8
 SELECT HEX(a) FROM t1;
 HEX(a)
 3F
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'))
diff --git a/mysql-test/main/ctype_utf8mb4_innodb.result b/mysql-test/main/ctype_utf8mb4_innodb.result
index 956b2f83d9e..82f0ddff1c4 100644
--- a/mysql-test/main/ctype_utf8mb4_innodb.result
+++ b/mysql-test/main/ctype_utf8mb4_innodb.result
@@ -222,7 +222,7 @@ drop table t1;
 create table t1 (s1 char(10) character set utf8mb4) engine InnoDB;
 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 InnoDB;
 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
@@ -238,7 +238,7 @@ drop table t1;
 create table t1 (s1 text character set utf8mb4) engine InnoDB;
 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
@@ -2286,7 +2286,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
@@ -2306,7 +2306,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
@@ -2398,7 +2398,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
@@ -2412,14 +2412,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'))
diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result
index fd58e12542c..0bd13ef0282 100644
--- a/mysql-test/main/ctype_utf8mb4_myisam.result
+++ b/mysql-test/main/ctype_utf8mb4_myisam.result
@@ -222,7 +222,7 @@ drop table t1;
 create table t1 (s1 char(10) character set utf8mb4) engine MyISAM;
 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 MyISAM;
 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
@@ -238,7 +238,7 @@ drop table t1;
 create table t1 (s1 text character set utf8mb4) engine MyISAM;
 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
@@ -2293,7 +2293,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
@@ -2313,7 +2313,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
@@ -2407,7 +2407,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
@@ -2421,14 +2421,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'))
diff --git a/mysql-test/main/custom_aggregate_functions.result b/mysql-test/main/custom_aggregate_functions.result
index 4060d6665f6..0a27334f58e 100644
--- a/mysql-test/main/custom_aggregate_functions.result
+++ b/mysql-test/main/custom_aggregate_functions.result
@@ -573,7 +573,7 @@ select f3(sal) from t1;
 f3(sal)
 1000
 select f2(val) from t1;
-ERROR 22007: Incorrect integer value: 'ab' for column 'x' at row 1
+ERROR 22007: Incorrect integer value: 'ab' for column ``.``.`x` at row 1
 select val, id, c from (select f1(sal) as c from t2) as t1, t2;
 val	id	c
 10	2	17000
diff --git a/mysql-test/main/delayed.result b/mysql-test/main/delayed.result
index 26a1fc670f4..ec36e3af46d 100644
--- a/mysql-test/main/delayed.result
+++ b/mysql-test/main/delayed.result
@@ -284,9 +284,9 @@ CREATE TABLE t2 (
 );
 SET SQL_MODE='NO_ZERO_DATE,STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
 INSERT DELAYED INTO t2 VALUES (0,'0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'f1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t2`.`f1` at row 1
 INSERT DELAYED INTO t2 VALUES (0,'2007-00-00');
-ERROR 22007: Incorrect date value: '2007-00-00' for column 'f1' at row 1
+ERROR 22007: Incorrect date value: '2007-00-00' for column `test`.`t2`.`f1` at row 1
 DROP TABLE t1,t2;
 set @old_delayed_updates = @@global.low_priority_updates;
 set global low_priority_updates = 1;
diff --git a/mysql-test/main/events_bugs.result b/mysql-test/main/events_bugs.result
index b56912dea7e..3e770451735 100644
--- a/mysql-test/main/events_bugs.result
+++ b/mysql-test/main/events_bugs.result
@@ -96,7 +96,7 @@ select release_lock('ee_16407_2');
 insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');
 end|
 insert into events_test.events_smode_test values ('test','1980-19-02')|
-ERROR 22007: Incorrect date value: '1980-19-02' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '1980-19-02' for column `events_test`.`events_smode_test`.`a` at row 1
 "This is ok"
 create event ee_16407_3 on schedule every 60 second do
 begin
diff --git a/mysql-test/main/fulltext.result b/mysql-test/main/fulltext.result
index 308d1d7fcb9..3f4223eee07 100644
--- a/mysql-test/main/fulltext.result
+++ b/mysql-test/main/fulltext.result
@@ -382,10 +382,10 @@ aus Osnabrück	utf8_general_ci	1.591140
 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR
 alter table t1 modify t varchar(200) collate latin1_german2_ci not null;
 Warnings:
-Warning	1366	Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column 't' at row 3
-Warning	1366	Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column 't' at row 4
-Warning	1366	Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column 't' at row 5
-Warning	1366	Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column 't' at row 6
+Warning	1366	Incorrect string value: '\xD0\xAD\xD1\x82\xD0\xBE...' for column `test`.`t1`.`t` at row 3
+Warning	1366	Incorrect string value: '\xD0\x9E\xD1\x82\xD0\xBB...' for column `test`.`t1`.`t` at row 4
+Warning	1366	Incorrect string value: '\xD0\x9D\xD0\xB5 \xD0...' for column `test`.`t1`.`t` at row 5
+Warning	1366	Incorrect string value: '\xD0\xB8 \xD0\xB1\xD1...' for column `test`.`t1`.`t` at row 6
 SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('Osnabrück');
 t	collation(t)
 aus Osnabrück	latin1_german2_ci
diff --git a/mysql-test/main/func_extract.result b/mysql-test/main/func_extract.result
index 46a0053add5..30ec0460d61 100644
--- a/mysql-test/main/func_extract.result
+++ b/mysql-test/main/func_extract.result
@@ -177,32 +177,32 @@ Warnings:
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '99991231235959.123456000'
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '20010101102030.123456000'
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '42949672965959.123456000'
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
-Warning	1292	Incorrect interval value: '42949672965959.123456000' for column 'b' at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
+Warning	1292	Incorrect interval value: '42949672965959.123456000' for column `test`.`t1`.`b` at row 3
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '42949672955959.123456000'
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
-Warning	1292	Incorrect interval value: '42949672955959.123456000' for column 'b' at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect interval value: '42949672955959.123456000' for column `test`.`t1`.`b` at row 4
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '876494165959.123456000'
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
-Warning	1292	Incorrect interval value: '876494165959.123456000' for column 'b' at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
+Warning	1292	Incorrect interval value: '876494165959.123456000' for column `test`.`t1`.`b` at row 5
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494155959.123456000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494145959.123456000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '99995959.123456000'
diff --git a/mysql-test/main/func_set.result b/mysql-test/main/func_set.result
index 73e121f5f2b..3bd9f5e0c9a 100644
--- a/mysql-test/main/func_set.result
+++ b/mysql-test/main/func_set.result
@@ -172,8 +172,8 @@ INTERVAL( 9, 1, DATE_ADD( pk, INTERVAL pk MINUTE_SECOND ), 9, 8, 3, 5, 2, 1 )
 8
 8
 Warnings:
-Warning	1292	Incorrect datetime value: '10' for column 'pk' at row 1
-Warning	1292	Incorrect datetime value: '11' for column 'pk' at row 2
+Warning	1292	Incorrect datetime value: '10' for column `test`.`t1`.`pk` at row 1
+Warning	1292	Incorrect datetime value: '11' for column `test`.`t1`.`pk` at row 2
 DROP TABLE t1;
 #
 # End of 5.3 tests
diff --git a/mysql-test/main/func_time_round.result b/mysql-test/main/func_time_round.result
index 208baae8cf9..b335cf393ba 100644
--- a/mysql-test/main/func_time_round.result
+++ b/mysql-test/main/func_time_round.result
@@ -131,12 +131,12 @@ NULL
 NULL
 NULL
 Warnings:
-Warning	1292	Incorrect time value: '8385959.9999999000' for column 'a' at row 17
-Warning	1292	Incorrect time value: '8395959.9999999000' for column 'a' at row 18
-Warning	1292	Incorrect time value: '876494145959.9999990000' for column 'a' at row 19
-Warning	1292	Incorrect time value: '876494145959.9999999000' for column 'a' at row 20
-Warning	1292	Incorrect time value: '876494155959.9999990000' for column 'a' at row 21
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
+Warning	1292	Incorrect time value: '8385959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 17
+Warning	1292	Incorrect time value: '8395959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 18
+Warning	1292	Incorrect time value: '876494145959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 19
+Warning	1292	Incorrect time value: '876494145959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 20
+Warning	1292	Incorrect time value: '876494155959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 21
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
 SELECT GREATEST(TIME'00:00:00', '00:00:00.0000004');
 GREATEST(TIME'00:00:00', '00:00:00.0000004')
 00:00:00.000000
@@ -494,11 +494,11 @@ Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '8395959.9999999000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494145959.9999990000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494145959.9999999000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494155959.9999990000'
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '876494155959.9999999000'
 SELECT
 TIME_TO_SEC(a),
@@ -529,18 +529,18 @@ NULL	NULL	876494145959.9999999000
 NULL	NULL	876494155959.9999990000
 NULL	NULL	876494155959.9999999000
 Warnings:
-Warning	1292	Incorrect time value: '8385959.9999999000' for column 'a' at row 17
-Warning	1292	Incorrect time value: '8385959.9999999000' for column 'a' at row 17
-Warning	1292	Incorrect time value: '8395959.9999999000' for column 'a' at row 18
-Warning	1292	Incorrect time value: '8395959.9999999000' for column 'a' at row 18
-Warning	1292	Incorrect time value: '876494145959.9999990000' for column 'a' at row 19
-Warning	1292	Incorrect time value: '876494145959.9999990000' for column 'a' at row 19
-Warning	1292	Incorrect time value: '876494145959.9999999000' for column 'a' at row 20
-Warning	1292	Incorrect time value: '876494145959.9999999000' for column 'a' at row 20
-Warning	1292	Incorrect time value: '876494155959.9999990000' for column 'a' at row 21
-Warning	1292	Incorrect time value: '876494155959.9999990000' for column 'a' at row 21
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
-Warning	1292	Incorrect time value: '876494155959.9999999000' for column 'a' at row 22
+Warning	1292	Incorrect time value: '8385959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 17
+Warning	1292	Incorrect time value: '8385959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 17
+Warning	1292	Incorrect time value: '8395959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 18
+Warning	1292	Incorrect time value: '8395959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 18
+Warning	1292	Incorrect time value: '876494145959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 19
+Warning	1292	Incorrect time value: '876494145959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 19
+Warning	1292	Incorrect time value: '876494145959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 20
+Warning	1292	Incorrect time value: '876494145959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 20
+Warning	1292	Incorrect time value: '876494155959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 21
+Warning	1292	Incorrect time value: '876494155959.9999990000' for column `test`.`t1_time_in_decimal`.`a` at row 21
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
+Warning	1292	Incorrect time value: '876494155959.9999999000' for column `test`.`t1_time_in_decimal`.`a` at row 22
 #
 # Functions with a single DATE input, conversion from DATETIME-in-VARCHAR
 #
diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 05e6e41852a..7695cef15c5 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -1679,7 +1679,7 @@ NULL
 #
 create table t1 (pt point);
 insert into t1 values(Geomfromtext('POLYGON((1 1, 2 2, 2 1, 1 1))'));
-ERROR 22007: Incorrect POINT value: 'POLYGON' for column 'pt' at row 1
+ERROR 22007: Incorrect POINT value: 'POLYGON' for column `test`.`t1`.`pt` at row 1
 drop table t1;
 SELECT st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100));
 st_astext(ST_Buffer(ST_PolygonFromText('POLYGON((3 5, 2 4, 2 5, 3 5))'), -100))
diff --git a/mysql-test/main/gis2.result b/mysql-test/main/gis2.result
index c0b476e080b..cb919ecdeb1 100644
--- a/mysql-test/main/gis2.result
+++ b/mysql-test/main/gis2.result
@@ -27,12 +27,12 @@ drop table t1;
 create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1))));
 set timestamp=10;
 insert into t1 values(default);
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`t1`.`p` at row 1
 drop table t1;
 SET timestamp=default;
 create table t1 (p point not null default if(unix_timestamp()>10,POINT(1,1),LineString(Point(0,0),Point(1,1))));
 set timestamp=10;
 alter table t1 add column i int;
-ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column 'p' at row 1
+ERROR 22007: Incorrect POINT value: 'GEOMETRYCOLLECTION' for column `test`.`(temporary)`.`p` at row 1
 drop table t1;
 SET timestamp=default;
diff --git a/mysql-test/main/innodb_icp.result b/mysql-test/main/innodb_icp.result
index 8a9106b8e45..00ca6b144ad 100644
--- a/mysql-test/main/innodb_icp.result
+++ b/mysql-test/main/innodb_icp.result
@@ -851,7 +851,7 @@ DROP TABLE t1;
 create table t1 (a int,b char(5),primary key (a), key (b(1)));
 insert ignore into t1 values ('a','b');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
 select 1 from t1 where a and b >= 'aa';
 1
 drop table t1;
diff --git a/mysql-test/main/insert.result b/mysql-test/main/insert.result
index 736aa917cae..4aea81262d2 100644
--- a/mysql-test/main/insert.result
+++ b/mysql-test/main/insert.result
@@ -92,14 +92,14 @@ create table t1(number int auto_increment primary key, original_value varchar(50
 set @value= "aa";
 insert ignore into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1366	Incorrect double value: 'aa' for column 'f_double' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_float' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_double_7_2' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_float_4_3' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_double_u' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_float_u' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_double_15_1_u' at row 1
-Warning	1366	Incorrect double value: 'aa' for column 'f_float_3_1_u' at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_double` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_float` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_double_7_2` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_float_4_3` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_double_u` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_float_u` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_double_15_1_u` at row 1
+Warning	1366	Incorrect double value: 'aa' for column `test`.`t1`.`f_float_3_1_u` at row 1
 select * from t1 where number =last_insert_id();
 number	1
 original_value	aa
@@ -136,14 +136,14 @@ f_float_3_1_u	1.0
 set @value= "aa1";
 insert ignore into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1366	Incorrect double value: 'aa1' for column 'f_double' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_float' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_double_7_2' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_float_4_3' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_double_u' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_float_u' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_double_15_1_u' at row 1
-Warning	1366	Incorrect double value: 'aa1' for column 'f_float_3_1_u' at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_double` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_float` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_7_2` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_4_3` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_u` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_u` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_double_15_1_u` at row 1
+Warning	1366	Incorrect double value: 'aa1' for column `test`.`t1`.`f_float_3_1_u` at row 1
 select * from t1 where number =last_insert_id();
 number	3
 original_value	aa1
diff --git a/mysql-test/main/loaddata.result b/mysql-test/main/loaddata.result
index 98b8f2de4a5..4c5cee0aa25 100644
--- a/mysql-test/main/loaddata.result
+++ b/mysql-test/main/loaddata.result
@@ -45,10 +45,10 @@ load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
+Warning	1366	Incorrect integer value: 'error      ' for column `test`.`t1`.`a` at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
 Note	1265	Data truncated for column 'a' at row 4
-Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 5
+Warning	1366	Incorrect integer value: 'wrong end  ' for column `test`.`t1`.`a` at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from t1;
 a	b
@@ -64,7 +64,7 @@ Note	1265	Data truncated for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
 Note	1265	Data truncated for column 'a' at row 3
 Warning	1366	Incorrect integer value: '
-' for column 'a' at row 4
+' for column `test`.`t1`.`a` at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from t1;
 a	b
diff --git a/mysql-test/main/myisam_icp.result b/mysql-test/main/myisam_icp.result
index 6a70521cd72..2048205528d 100644
--- a/mysql-test/main/myisam_icp.result
+++ b/mysql-test/main/myisam_icp.result
@@ -849,7 +849,7 @@ DROP TABLE t1;
 create table t1 (a int,b char(5),primary key (a), key (b(1)));
 insert ignore into t1 values ('a','b');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
 select 1 from t1 where a and b >= 'aa';
 1
 drop table t1;
diff --git a/mysql-test/main/outfile_loaddata.result b/mysql-test/main/outfile_loaddata.result
index 0ea692f3ab5..4356f8b113e 100644
--- a/mysql-test/main/outfile_loaddata.result
+++ b/mysql-test/main/outfile_loaddata.result
@@ -211,7 +211,7 @@ a	b	c
 # latin1 charset (INTO OUTFILE warning is expected):
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' CHARACTER SET latin1 FROM t1;
 Warnings:
-Warning	1366	Incorrect string value: '\xE1\xE2\xF7' for column 'b' at row 1
+Warning	1366	Data truncated for column 'b' at row 1
 ##################################################
 1	ABC-???	DEF-ÂÃÄ
 2	\N	\N
@@ -226,7 +226,7 @@ a	b	c
 # KOI8-R charset (INTO OUTFILE warning is expected):
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' CHARACTER SET koi8r FROM t1;
 Warnings:
-Warning	1366	Incorrect string value: '\xC2\xC3\xC4' for column 'c' at row 1
+Warning	1366	Data truncated for column 'c' at row 1
 ##################################################
 1	ABC-áâ÷	DEF-???
 2	\N	\N
diff --git a/mysql-test/main/partition_innodb.result b/mysql-test/main/partition_innodb.result
index 58401096e28..7d26e5fe216 100644
--- a/mysql-test/main/partition_innodb.result
+++ b/mysql-test/main/partition_innodb.result
@@ -911,7 +911,7 @@ CREATE ALGORITHM = MERGE VIEW v AS SELECT a, b FROM t1 STRAIGHT_JOIN t2 WHERE b
 INSERT INTO t1 VALUES (1),(2);
 INSERT IGNORE INTO t2 VALUES (2,2),('three',3),(4,4);
 Warnings:
-Warning	1366	Incorrect integer value: 'three' for column 'b' at row 2
+Warning	1366	Incorrect integer value: 'three' for column `test`.`t2`.`b` at row 2
 UPDATE v SET a = NULL;
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'foo'
diff --git a/mysql-test/main/processlist.result b/mysql-test/main/processlist.result
index b8e2271530d..ab518d961ef 100644
--- a/mysql-test/main/processlist.result
+++ b/mysql-test/main/processlist.result
@@ -39,7 +39,7 @@ utf8mb4_string	xxx😎yyy
 Warnings:
 Level	Warning
 Code	1366
-Message	Incorrect string value: '\xF0\x9F\x98\x8Eyy...' for column 'INFO' at row 1
+Message	Incorrect string value: '\xF0\x9F\x98\x8Eyy...' for column `information_schema`.`(temporary)`.`INFO` at row 1
 #
 # End of 10.1 tests
 #
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result
index 9760989a736..a72b6660288 100644
--- a/mysql-test/main/ps.result
+++ b/mysql-test/main/ps.result
@@ -5165,13 +5165,13 @@ DECLARE a DATETIME;
 CALL p1(a);
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
 BEGIN NOT ATOMIC
 DECLARE a DATETIME;
 EXECUTE IMMEDIATE 'CALL p1(?)' USING a;
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
 BEGIN NOT ATOMIC
 DECLARE a DATETIME;
 PREPARE stmt FROM 'CALL p1(?)';
@@ -5179,7 +5179,7 @@ EXECUTE stmt  USING a;
 DEALLOCATE PREPARE stmt;
 END;
 $$
-ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1
 DROP PROCEDURE p1;
 #
 # MDEV-14454 Binary protocol returns wrong collation ID for SP OUT parameters
diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result
index 0255a13a8ba..2c2f7be096d 100644
--- a/mysql-test/main/range.result
+++ b/mysql-test/main/range.result
@@ -2059,22 +2059,22 @@ SELECT * FROM t1 WHERE fd='😁';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 SELECT * FROM t1 WHERE fd='😁';
 id	fd
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 # The following must not use range access:
 explain select count(*) from t1 where fd <'😁';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ix_fd	ix_fd	63	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 select count(*) from t1 where fd <'😁';
 count(*)
 40960
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 select count(*) from t1 ignore index (ix_fd) where fd <'😁';
 count(*)
 40960
@@ -2297,7 +2297,7 @@ EXPLAIN SELECT * FROM t1 WHERE a<=>'😎';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 #
 # MDEV-10185: Assertion `tree1->keys[key_no] && tree2->keys[key_no]' failed in 
diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result
index 941c79763cf..97f35bfe7b3 100644
--- a/mysql-test/main/range_mrr_icp.result
+++ b/mysql-test/main/range_mrr_icp.result
@@ -2061,22 +2061,22 @@ SELECT * FROM t1 WHERE fd='😁';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 SELECT * FROM t1 WHERE fd='😁';
 id	fd
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 # The following must not use range access:
 explain select count(*) from t1 where fd <'😁';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	ix_fd	ix_fd	63	NULL	#	Using where; Using index
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 select count(*) from t1 where fd <'😁';
 count(*)
 40960
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column 'fd' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x81' for column `test`.`t1`.`fd` at row 1
 select count(*) from t1 ignore index (ix_fd) where fd <'😁';
 count(*)
 40960
@@ -2299,7 +2299,7 @@ EXPLAIN SELECT * FROM t1 WHERE a<=>'😎';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
-Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column 'a' at row 1
+Warning	1366	Incorrect string value: '\xF0\x9F\x98\x8E' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 #
 # MDEV-10185: Assertion `tree1->keys[key_no] && tree2->keys[key_no]' failed in 
diff --git a/mysql-test/main/sp-cursor.result b/mysql-test/main/sp-cursor.result
index 42952be16e2..2656ef8821d 100644
--- a/mysql-test/main/sp-cursor.result
+++ b/mysql-test/main/sp-cursor.result
@@ -172,7 +172,7 @@ CALL p1('b1');
 v_a
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'b1' for column 'p_a' at row 1
+Warning	1366	Incorrect integer value: 'b1' for column ``.``.`p_a` at row 1
 DROP PROCEDURE p1;
 SET sql_mode=DEFAULT;
 #
diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result
index 74723f832a7..3d4e7895fa4 100644
--- a/mysql-test/main/sp-error.result
+++ b/mysql-test/main/sp-error.result
@@ -2784,7 +2784,7 @@ END|
 
 CALL p1()|
 Warnings:
-Warning	1366	Incorrect integer value: 'string' for column 'var1' at row 1
+Warning	1366	Incorrect integer value: 'string' for column ``.``.`var1` at row 1
 
 SET sql_mode = DEFAULT;
 CREATE PROCEDURE p2()
diff --git a/mysql-test/main/sp-vars.result b/mysql-test/main/sp-vars.result
index 0d4d18c577d..236695a6c0f 100644
--- a/mysql-test/main/sp-vars.result
+++ b/mysql-test/main/sp-vars.result
@@ -140,7 +140,7 @@ SELECT sp_vars_check_ret3();
 sp_vars_check_ret3()
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
@@ -195,7 +195,7 @@ SELECT sp_vars_check_ret3();
 sp_vars_check_ret3()
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+Warning	1366	Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
@@ -314,7 +314,7 @@ ERROR 22003: Out of range value for column 'sp_vars_check_ret1()' at row 1
 SELECT sp_vars_check_ret2();
 ERROR 22003: Out of range value for column 'sp_vars_check_ret2()' at row 1
 SELECT sp_vars_check_ret3();
-ERROR 22007: Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1
+ERROR 22007: Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1
 SELECT sp_vars_check_ret4();
 sp_vars_check_ret4()
 154.12
@@ -896,7 +896,7 @@ sp_var
 @user_var
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'Hello, world!' for column 'sp_var' at row 1
+Warning	1366	Incorrect integer value: 'Hello, world!' for column ``.``.`sp_var` at row 1
 DROP PROCEDURE p1;
 DROP TABLE t1;
 
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 7ab772d1376..b110ab670ae 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -4590,7 +4590,7 @@ call bug15231_3()|
 Result
 Missed it (correct)
 Level	Code	Message
-Warning	1366	Incorrect decimal value: 'zap' for column 'x' at row 1
+Warning	1366	Incorrect decimal value: 'zap' for column ``.``.`x` at row 1
 Result
 Caught it (correct)
 call bug15231_5()|
@@ -6455,7 +6455,7 @@ DROP TABLE t1;
 
 CALL p2('text');
 Warnings:
-Warning	1366	Incorrect integer value: 'text' for column 'v' at row 1
+Warning	1366	Incorrect integer value: 'text' for column ``.``.`v` at row 1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -8374,7 +8374,7 @@ FETCH c INTO a;
 CLOSE c;
 END;
 $$
-ERROR 22007: Incorrect integer value: 'y' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'y' for column ``.``.`a` at row 1
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 #
diff --git a/mysql-test/main/strict.result b/mysql-test/main/strict.result
index 315bb9dc1b5..b9db4166398 100644
--- a/mysql-test/main/strict.result
+++ b/mysql-test/main/strict.result
@@ -8,43 +8,43 @@ CREATE TABLE t1 (col1 date);
 INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29');
 INSERT INTO t1 VALUES('0000-10-31');
 INSERT INTO t1 VALUES('2004-0-31');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-01-02'),('2004-0-31');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 2
 INSERT INTO t1 VALUES('2004-10-0');
-ERROR 22007: Incorrect date value: '2004-10-0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-10-0' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-09-31');
-ERROR 22007: Incorrect date value: '2004-09-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-09-31' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-32');
-ERROR 22007: Incorrect date value: '2004-10-32' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-10-32' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-13-15');
-ERROR 22007: Incorrect date value: '2004-13-15' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-15' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect date value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '59' for column `test`.`t1`.`col1` at row 1
 set @@sql_mode='STRICT_ALL_TABLES';
 INSERT INTO t1 VALUES('2004-01-03'),('2004-0-31');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
 INSERT INTO t1 VALUES('2004-0-30');
-ERROR 22007: Incorrect date value: '2004-0-30' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-30' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-01-04'),('2004-0-31'),('2004-01-05');
-ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-0-31' for column `test`.`t1`.`col1` at row 2
 INSERT INTO t1 VALUES('0000-00-00');
 INSERT IGNORE INTO t1 VALUES('2004-0-29');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
 INSERT INTO t1 VALUES('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
 INSERT IGNORE INTO t1 VALUES('0000-00-00');
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
 INSERT INTO t1 VALUES ('2004-0-30');
 INSERT INTO t1 VALUES ('2004-2-30');
-ERROR 22007: Incorrect date value: '2004-2-30' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-2-30' for column `test`.`t1`.`col1` at row 1
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
 INSERT INTO t1 VALUES ('2004-2-30');
 set @@sql_mode='ansi,traditional';
@@ -73,7 +73,7 @@ drop table t1;
 set @@sql_mode='strict_trans_tables';
 CREATE TABLE t1 (col1 date) engine=myisam;
 INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 2
@@ -81,7 +81,7 @@ INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
 INSERT INTO t1 VALUES ('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
 INSERT ignore INTO t1 VALUES('2003-02-30');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
@@ -100,14 +100,14 @@ drop table t1;
 set @@sql_mode='strict_trans_tables';
 CREATE TABLE t1 (col1 date) engine=innodb;
 INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
-ERROR 22007: Incorrect date value: '2004-13-31' for column 'col1' at row 2
+ERROR 22007: Incorrect date value: '2004-13-31' for column `test`.`t1`.`col1` at row 2
 INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
 INSERT INTO t1 VALUES ('2003-02-29');
-ERROR 22007: Incorrect date value: '2003-02-29' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29' for column `test`.`t1`.`col1` at row 1
 INSERT ignore INTO t1 VALUES('2003-02-30');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
@@ -125,21 +125,21 @@ CREATE TABLE t1 (col1 datetime);
 INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');
 INSERT INTO t1 VALUES('0000-10-31 15:30:00');
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-09-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2003-02-29 15:30:00');
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-13-15 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('0000-00-00 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect datetime value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '59' for column `test`.`t1`.`col1` at row 1
 select * from t1;
 col1
 2004-10-31 15:30:00
@@ -149,49 +149,49 @@ drop table t1;
 CREATE TABLE t1 (col1 timestamp);
 INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');
 INSERT INTO t1 VALUES('0000-10-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-09-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2003-02-29 15:30:00');
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-13-15 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-13-15 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-02-29 25:30:00');
-ERROR 22007: Incorrect datetime value: '2004-02-29 25:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 25:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-02-29 15:65:00');
-ERROR 22007: Incorrect datetime value: '2004-02-29 15:65:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 15:65:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-02-29 15:31:61');
-ERROR 22007: Incorrect datetime value: '2004-02-29 15:31:61' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-29 15:31:61' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('0000-00-00 15:30:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`col1` at row 1
 INSERT IGNORE INTO t1 VALUES('0000-00-00 00:00:00');
 Warnings:
 Warning	1265	Data truncated for column 'col1' at row 1
 INSERT INTO t1 VALUES ('59');
-ERROR 22007: Incorrect datetime value: '59' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '59' for column `test`.`t1`.`col1` at row 1
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-0 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
-ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-10-32 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('2004-02-30 15:30:04');
-ERROR 22007: Incorrect datetime value: '2004-02-30 15:30:04' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '2004-02-30 15:30:04' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`col1` at row 1
 set @@sql_mode='ansi,traditional';
 SELECT * FROM t1;
 col1
@@ -214,11 +214,11 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-09-31 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2003-02-29 15:30:00' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -228,27 +228,27 @@ ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_dat
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col2' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col2` at row 1
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col2' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col2` at row 1
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 ERROR HY000: Incorrect datetime value: '00.00.0000' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '31.0.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '0.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '2004-09-31 15:30:00' for column `test`.`t1`.`col3` at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
-ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '2003-02-29 15:30:00' for column `test`.`t1`.`col3` at row 1
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
 ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_date
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
@@ -273,7 +273,7 @@ ERROR 22007: Incorrect datetime value: '2004-0-10 15:30'
 INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
 INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-10-0 15:30'
 INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -291,7 +291,7 @@ ERROR 22007: Incorrect datetime value: '2004-10-0'
 INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
 ERROR 22007: Incorrect datetime value: '2004-0-10'
 INSERT INTO t1 (col1) VALUES('2004-0-10');
-ERROR 22007: Incorrect date value: '2004-0-10' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '2004-0-10' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));
 ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
@@ -302,7 +302,7 @@ ERROR 22007: Incorrect datetime value: '2004-0-10 15:30'
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));
 ERROR 22007: Incorrect datetime value: '0000-00-00'
 INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
-ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1
+ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column `test`.`t1`.`col3` at row 1
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
 ERROR 22007: Incorrect datetime value: '2004-10-0 15:30'
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
@@ -366,9 +366,9 @@ Warnings:
 Warning	1365	Division by 0
 Warning	1365	Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -449,9 +449,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -533,9 +533,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -617,9 +617,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -699,9 +699,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect integer value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -786,9 +786,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col1= MOD(col1,0) WHERE col1 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect decimal value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -853,9 +853,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect double value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -903,9 +903,9 @@ ERROR 22012: Division by 0
 UPDATE t1 SET col2= MOD(col2,0) WHERE col2 > 0;
 ERROR 22012: Division by 0
 INSERT INTO t1 (col1) VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('a59b');
-ERROR 22007: Incorrect double value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect double value: 'a59b' for column `test`.`t1`.`col1` at row 1
 INSERT INTO t1 (col1) VALUES ('1a');
 ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT IGNORE INTO t1 (col1) VALUES ('2a');
@@ -1135,9 +1135,9 @@ NULL	10
 drop table t1;
 create table t1 (col1 date, col2 datetime, col3 timestamp);
 insert into t1 values (0,0,0);
-ERROR 22007: Incorrect date value: '0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0' for column `test`.`t1`.`col1` at row 1
 insert into t1 values (0.0,0.0,0.0);
-ERROR 22007: Incorrect date value: '0.0' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0.0' for column `test`.`t1`.`col1` at row 1
 insert into t1 (col1) values (convert('0000-00-00',date));
 ERROR 22007: Incorrect datetime value: '0000-00-00'
 insert into t1 (col1) values (cast('0000-00-00' as date));
@@ -1160,7 +1160,7 @@ insert ignore into t1 values ('0000-00-00');
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
 insert into t1 select * from t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
 insert ignore into t1 values ('0000-00-00');
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
@@ -1168,15 +1168,15 @@ insert ignore into t1 (col1) values (cast('0000-00-00' as date));
 Warnings:
 Warning	1292	Incorrect datetime value: '0000-00-00'
 insert into t1 select * from t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column ``.`(temporary)`.`col1` at row 1
 alter table t1 modify col1 datetime;
-ERROR 22007: Incorrect datetime value: '0000-00-00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00' for column `test`.`t1`.`col1` at row 1
 alter ignore table t1 modify col1 datetime;
 Warnings:
 Warning	1264	Out of range value for column 'col1' at row 1
 Warning	1264	Out of range value for column 'col1' at row 2
 insert into t1 select * from t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'col1' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column ``.`(temporary)`.`col1` at row 1
 select * from t1;
 col1
 0000-00-00 00:00:00
@@ -1256,12 +1256,12 @@ drop table t1;
 set @@sql_mode='traditional';
 create table t1 (d date);
 insert into t1 values ('2000-10-00');
-ERROR 22007: Incorrect date value: '2000-10-00' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '2000-10-00' for column `test`.`t1`.`d` at row 1
 insert into t1 values (1000);
-ERROR 22007: Incorrect date value: '1000' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '1000' for column `test`.`t1`.`d` at row 1
 insert into t1 values ('2000-10-01');
 update t1 set d = 1100;
-ERROR 22007: Incorrect date value: '1100' for column 'd' at row 1
+ERROR 22007: Incorrect date value: '1100' for column `test`.`t1`.`d` at row 1
 select * from t1;
 d
 2000-10-01
@@ -1457,34 +1457,34 @@ col5 mediumint, col6 mediumint unsigned,
 col7 int, col8 int unsigned,
 col9 bigint, col10 bigint unsigned);
 insert into t1(col1) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col1' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col1` at row 1
 insert into t1(col2) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col2' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col2` at row 1
 insert into t1(col3) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col3' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col3` at row 1
 insert into t1(col4) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col4' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col4` at row 1
 insert into t1(col5) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col5' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col5` at row 1
 insert into t1(col6) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col6' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col6` at row 1
 insert into t1(col7) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col7' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col7` at row 1
 insert into t1(col8) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col8' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col8` at row 1
 insert into t1(col9) values('-');
-ERROR 22007: Incorrect integer value: '-' for column 'col9' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`col9` at row 1
 insert into t1(col10) values('+');
-ERROR 22007: Incorrect integer value: '+' for column 'col10' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`col10` at row 1
 drop table t1;
 set sql_mode='traditional';
 create table t1(a year);
 insert into t1 values ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
 insert into t1 values ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
 insert into t1 values ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
 insert into t1 values ('2000a');
 ERROR 01000: Data truncated for column 'a' at row 1
 insert into t1 values ('2E3x');
diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result
index 93a8ff83ab6..732024bb607 100644
--- a/mysql-test/main/subselect_mat.result
+++ b/mysql-test/main/subselect_mat.result
@@ -1667,8 +1667,8 @@ DROP TABLE t1,t2,t3,t4,t5;
 CREATE TABLE t2 (a int);
 INSERT IGNORE INTO t2 VALUES ('a'),('a');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 2
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 2
 CREATE TABLE t4 (a varchar(1));
 INSERT INTO t4 VALUES ('m'),('o');
 CREATE TABLE t3 (a varchar(1) , b varchar(1) ) ;
diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result
index ce9aa2d6c40..a494b9d1cf7 100644
--- a/mysql-test/main/subselect_sj_mat.result
+++ b/mysql-test/main/subselect_sj_mat.result
@@ -1704,8 +1704,8 @@ DROP TABLE t1,t2,t3,t4,t5;
 CREATE TABLE t2 (a int);
 INSERT IGNORE INTO t2 VALUES ('a'),('a');
 Warnings:
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'a' for column 'a' at row 2
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 1
+Warning	1366	Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 2
 CREATE TABLE t4 (a varchar(1));
 INSERT INTO t4 VALUES ('m'),('o');
 CREATE TABLE t3 (a varchar(1) , b varchar(1) ) ;
diff --git a/mysql-test/main/trigger.result b/mysql-test/main/trigger.result
index 1669ca70bb8..1adf3c68a08 100644
--- a/mysql-test/main/trigger.result
+++ b/mysql-test/main/trigger.result
@@ -622,7 +622,7 @@ drop table t1;
 set sql_mode="traditional";
 create table t1 (a date);
 insert into t1 values ('2004-01-00');
-ERROR 22007: Incorrect date value: '2004-01-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '2004-01-00' for column `test`.`t1`.`a` at row 1
 set sql_mode="";
 create trigger t1_bi before insert on t1 for each row set new.a = '2004-01-00';
 set sql_mode="traditional";
diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result
index 2c268cfdd88..fb117d40dd7 100644
--- a/mysql-test/main/type_date.result
+++ b/mysql-test/main/type_date.result
@@ -108,7 +108,7 @@ DROP TABLE t1, t2, t3;
 CREATE TABLE t1 (y YEAR);
 INSERT IGNORE INTO t1 VALUES ('abc');
 Warnings:
-Warning	1366	Incorrect integer value: 'abc' for column 'y' at row 1
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`y` at row 1
 SELECT * FROM t1;
 y
 0000
@@ -221,7 +221,7 @@ a
 0000-00-00
 0000-00-00
 INSERT INTO t1 VALUES ('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1
 SET SQL_MODE=DEFAULT;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (a DATE);
@@ -250,7 +250,7 @@ a
 1000-00-00
 1000-00-00
 INSERT INTO t1 VALUES ('1000-00-00');
-ERROR 22007: Incorrect date value: '1000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '1000-00-00' for column `test`.`t1`.`a` at row 1
 SET SQL_MODE=DEFAULT;
 DROP TABLE t1,t2;
 CREATE TABLE t1 SELECT curdate() AS f1;
@@ -504,7 +504,7 @@ SET sql_mode=DEFAULT;
 CREATE TABLE t1 (a DATE DEFAULT '0000-00-00');
 SET sql_mode=TRADITIONAL;
 INSERT INTO t1 VALUES ('0000-00-00');
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`a` at row 1
 INSERT INTO t1 VALUES ();
 ERROR 22007: Incorrect default value '0000-00-00' for column 'a'
 INSERT INTO t1 VALUES (DEFAULT);
@@ -545,7 +545,7 @@ CREATE TABLE t1 (a DATE);;
 INSERT INTO t1 VALUES (0);
 SET sql_mode='TRADITIONAL';
 CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect date value: '0000-00-00' for column 'a' at row 1
+ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t2`.`a` at row 1
 DROP TABLE t1;
 #
 # End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
@@ -819,9 +819,9 @@ DATE(a)	DATE(b)	DATE(c)
 NULL	NULL	NULL
 2001-01-01	2001-01-01	2001-01-01
 Warnings:
-Warning	1292	Incorrect datetime value: '1' for column 'a' at row 1
-Warning	1292	Incorrect datetime value: '1' for column 'b' at row 1
-Warning	1292	Incorrect datetime value: '1' for column 'c' at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`a` at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`b` at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`c` at row 1
 SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1;
 DATE(COALESCE(a))	DATE(COALESCE(b))	DATE(COALESCE(c))
 NULL	NULL	NULL
@@ -839,9 +839,9 @@ DATE(a)	DATE(b)	DATE(c)
 NULL	NULL	NULL
 2001-01-01	2001-01-01	2001-01-01
 Warnings:
-Warning	1292	Incorrect datetime value: '1' for column 'a' at row 1
-Warning	1292	Incorrect datetime value: '1' for column 'b' at row 1
-Warning	1292	Incorrect datetime value: '1' for column 'c' at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`a` at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`b` at row 1
+Warning	1292	Incorrect datetime value: '1' for column `test`.`t1`.`c` at row 1
 SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1;
 DATE(COALESCE(a))	DATE(COALESCE(b))	DATE(COALESCE(c))
 NULL	NULL	NULL
diff --git a/mysql-test/main/type_datetime.result b/mysql-test/main/type_datetime.result
index 7a213842e03..6f2aa386276 100644
--- a/mysql-test/main/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
@@ -216,7 +216,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 Warnings:
 Note	1265	Data truncated for column 'da' at row 1
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
 select * from t1;
 da	dt
 1962-03-03	1962-03-03 00:00:00
@@ -610,7 +610,7 @@ insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 Warnings:
 Note	1265	Data truncated for column 'da' at row 1
 insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
-ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+ERROR 22007: Incorrect date value: '2007-03-32' for column `test`.`t1`.`da` at row 1
 select * from t1;
 da	dt
 1962-03-03	1962-03-03 00:00:00
@@ -854,7 +854,7 @@ SET sql_mode=DEFAULT;
 CREATE TABLE t1 (a DATETIME DEFAULT '0000-00-00 00:00:00');
 SET sql_mode=TRADITIONAL;
 INSERT INTO t1 VALUES ('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
 INSERT INTO t1 VALUES ();
 ERROR 22007: Incorrect default value '0000-00-00 00:00:00' for column 'a'
 INSERT INTO t1 VALUES (DEFAULT);
@@ -895,7 +895,7 @@ CREATE TABLE t1 (a DATETIME);;
 INSERT INTO t1 VALUES (0);
 SET sql_mode='TRADITIONAL';
 CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t2`.`a` at row 1
 DROP TABLE t1;
 #
 # End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
diff --git a/mysql-test/main/type_decimal.result b/mysql-test/main/type_decimal.result
index dadaa5a4b77..769c59b197d 100644
--- a/mysql-test/main/type_decimal.result
+++ b/mysql-test/main/type_decimal.result
@@ -176,9 +176,9 @@ Note	1265	Data truncated for column 'a' at row 2
 insert ignore into t1 values ("1e+18446744073709551615"),("1e+18446744073709551616"),("1e-9223372036854775807"),("1e-9223372036854775809");
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-Warning	1366	Incorrect decimal value: '1e+18446744073709551616' for column 'a' at row 2
+Warning	1366	Incorrect decimal value: '1e+18446744073709551616' for column `test`.`t1`.`a` at row 2
 Note	1265	Data truncated for column 'a' at row 3
-Warning	1366	Incorrect decimal value: '1e-9223372036854775809' for column 'a' at row 4
+Warning	1366	Incorrect decimal value: '1e-9223372036854775809' for column `test`.`t1`.`a` at row 4
 insert ignore into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
diff --git a/mysql-test/main/type_float.result b/mysql-test/main/type_float.result
index bd1a722f80b..0ce54c0126c 100644
--- a/mysql-test/main/type_float.result
+++ b/mysql-test/main/type_float.result
@@ -498,7 +498,7 @@ Warnings:
 Warning	1265	Data truncated for column 'f' at row 1
 INSERT IGNORE INTO t1 VALUES ('.');
 Warnings:
-Warning	1366	Incorrect double value: '.' for column 'f' at row 1
+Warning	1366	Incorrect double value: '.' for column `test`.`t1`.`f` at row 1
 SELECT * FROM t1 ORDER BY f;
 f
 0
diff --git a/mysql-test/main/type_interval.result b/mysql-test/main/type_interval.result
index 70a5d78b214..65c84022210 100644
--- a/mysql-test/main/type_interval.result
+++ b/mysql-test/main/type_interval.result
@@ -74,8 +74,8 @@ Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '8385959.000000000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '8390000.000000000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '20180102.000000000'
 Note	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '876494155959.000000000'
-Warning	1292	Incorrect interval value: '876494160000.000000000' for column 'a' at row 8
-Warning	1292	Incorrect interval value: '876494160000.000000000' for column 'a' at row 8
+Warning	1292	Incorrect interval value: '876494160000.000000000' for column `test`.`t1`.`a` at row 8
+Warning	1292	Incorrect interval value: '876494160000.000000000' for column `test`.`t1`.`a` at row 8
 Warning	1292	Incorrect INTERVAL DAY TO SECOND value: '876494160000.000000000'
 DROP TABLE t1;
 #
diff --git a/mysql-test/main/type_newdecimal.result b/mysql-test/main/type_newdecimal.result
index 140f36b1261..44f200c229b 100644
--- a/mysql-test/main/type_newdecimal.result
+++ b/mysql-test/main/type_newdecimal.result
@@ -825,7 +825,7 @@ Warning	1365	Division by 0
 Warning	1365	Division by 0
 Warning	1365	Division by 0
 INSERT INTO Sow6_2f VALUES ('a59b');
-ERROR 22007: Incorrect decimal value: 'a59b' for column 'col1' at row 1
+ERROR 22007: Incorrect decimal value: 'a59b' for column `test`.`Sow6_2f`.`col1` at row 1
 drop table Sow6_2f;
 select 10.3330000000000/12.34500000;
 10.3330000000000/12.34500000
diff --git a/mysql-test/main/type_newdecimal.test b/mysql-test/main/type_newdecimal.test
index d2d64b0baee..56273a47b44 100644
--- a/mysql-test/main/type_newdecimal.test
+++ b/mysql-test/main/type_newdecimal.test
@@ -837,6 +837,7 @@ UPDATE Sow6_2f SET col1 = col1 / 0 WHERE col1 > 0;
 #-- should return SQLSTATE 22012 division by zero
 SELECT MOD(col1,0) FROM Sow6_2f;
 #-- should return SQLSTATE 22012 division by zero
+--replace_result sow Sow
 -- error 1366
 INSERT INTO Sow6_2f VALUES ('a59b');
 #-- should return SQLSTATE 22018 invalid character value for cast
diff --git a/mysql-test/main/type_num.result b/mysql-test/main/type_num.result
index 966d94ee385..2dadb4f1f8d 100644
--- a/mysql-test/main/type_num.result
+++ b/mysql-test/main/type_num.result
@@ -42,171 +42,171 @@ Note	1265	Data truncated for column 'a' at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect double value: '' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect integer value: '' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES ('');
-ERROR 22007: Incorrect decimal value: '' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect double value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect double value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect integer value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES ('x');
-ERROR 22007: Incorrect decimal value: 'x' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: 'x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect double value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect double value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect double value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect integer value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES (' x');
-ERROR 22007: Incorrect decimal value: ' x' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: ' x' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect double value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect double value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect integer value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES ('.');
-ERROR 22007: Incorrect decimal value: '.' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '.' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect double value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect double value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect integer value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES ('-');
-ERROR 22007: Incorrect decimal value: '-' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '-' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect double value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect double value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect double value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYINT);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a SMALLINT);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a BIGINT);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect integer value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect integer value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a DECIMAL);
 INSERT INTO t1 VALUES ('+');
-ERROR 22007: Incorrect decimal value: '+' for column 'a' at row 1
+ERROR 22007: Incorrect decimal value: '+' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 CREATE TABLE t1 (a FLOAT);
 INSERT INTO t1 VALUES ('1x');
@@ -425,58 +425,58 @@ Note	1265	Data truncated for column 'i8' at row 1
 Note	1265	Data truncated for column 'd' at row 1
 INSERT IGNORE INTO t1 VALUES ('','','','','','','');
 Warnings:
-Warning	1366	Incorrect double value: '' for column 'f4' at row 1
-Warning	1366	Incorrect double value: '' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: '' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: '' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: '' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: '' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: '' for column 'd' at row 1
+Warning	1366	Incorrect double value: '' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: '' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: '' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: '' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: '' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: '' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: '' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES ('x','x','x','x','x','x','x');
 Warnings:
-Warning	1366	Incorrect double value: 'x' for column 'f4' at row 1
-Warning	1366	Incorrect double value: 'x' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: 'x' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: 'x' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: 'x' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: 'x' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: 'x' for column 'd' at row 1
+Warning	1366	Incorrect double value: 'x' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: 'x' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: 'x' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: 'x' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: 'x' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: 'x' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: 'x' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES (' x',' x',' x',' x',' x',' x',' x');
 Warnings:
-Warning	1366	Incorrect double value: ' x' for column 'f4' at row 1
-Warning	1366	Incorrect double value: ' x' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: ' x' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: ' x' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: ' x' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: ' x' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: ' x' for column 'd' at row 1
+Warning	1366	Incorrect double value: ' x' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: ' x' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: ' x' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: ' x' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: ' x' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: ' x' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: ' x' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES ('.','.','.','.','.','.','.');
 Warnings:
-Warning	1366	Incorrect double value: '.' for column 'f4' at row 1
-Warning	1366	Incorrect double value: '.' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: '.' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: '.' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: '.' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: '.' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: '.' for column 'd' at row 1
+Warning	1366	Incorrect double value: '.' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: '.' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: '.' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: '.' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: '.' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: '.' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: '.' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES ('-','-','-','-','-','-','-');
 Warnings:
-Warning	1366	Incorrect double value: '-' for column 'f4' at row 1
-Warning	1366	Incorrect double value: '-' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: '-' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: '-' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: '-' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: '-' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: '-' for column 'd' at row 1
+Warning	1366	Incorrect double value: '-' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: '-' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: '-' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: '-' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: '-' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: '-' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: '-' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES ('+','+','+','+','+','+','+');
 Warnings:
-Warning	1366	Incorrect double value: '+' for column 'f4' at row 1
-Warning	1366	Incorrect double value: '+' for column 'f8' at row 1
-Warning	1366	Incorrect integer value: '+' for column 'i1' at row 1
-Warning	1366	Incorrect integer value: '+' for column 'i2' at row 1
-Warning	1366	Incorrect integer value: '+' for column 'i4' at row 1
-Warning	1366	Incorrect integer value: '+' for column 'i8' at row 1
-Warning	1366	Incorrect decimal value: '+' for column 'd' at row 1
+Warning	1366	Incorrect double value: '+' for column `test`.`t1`.`f4` at row 1
+Warning	1366	Incorrect double value: '+' for column `test`.`t1`.`f8` at row 1
+Warning	1366	Incorrect integer value: '+' for column `test`.`t1`.`i1` at row 1
+Warning	1366	Incorrect integer value: '+' for column `test`.`t1`.`i2` at row 1
+Warning	1366	Incorrect integer value: '+' for column `test`.`t1`.`i4` at row 1
+Warning	1366	Incorrect integer value: '+' for column `test`.`t1`.`i8` at row 1
+Warning	1366	Incorrect decimal value: '+' for column `test`.`t1`.`d` at row 1
 INSERT IGNORE INTO t1 VALUES ('1x','1x','1x','1x','1x','1x','1x');
 Warnings:
 Warning	1265	Data truncated for column 'f4' at row 1
diff --git a/mysql-test/main/type_time.result b/mysql-test/main/type_time.result
index 00b7386a64e..38b732d6f16 100644
--- a/mysql-test/main/type_time.result
+++ b/mysql-test/main/type_time.result
@@ -320,7 +320,7 @@ DROP TABLE t2,t1;
 SET sql_mode=traditional;
 CREATE TABLE t1 (a TIME(6));
 INSERT INTO t1 VALUES (CAST(0xFFFFFFFF00000000 AS UNSIGNED));
-ERROR 22007: Incorrect time value: '18446744069414584320' for column 'a' at row 1
+ERROR 22007: Incorrect time value: '18446744069414584320' for column `test`.`t1`.`a` at row 1
 SET sql_mode=DEFAULT;
 INSERT IGNORE INTO t1 VALUES (CAST(0xFFFFFFFF00000000 AS UNSIGNED));
 Warnings:
@@ -1179,7 +1179,7 @@ SELECT CAST(a AS TIME), CAST(-9223372036854775808 AS TIME) FROM t1;
 CAST(a AS TIME)	CAST(-9223372036854775808 AS TIME)
 -838:59:59	-838:59:59
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'a' at row 1
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1`.`a` at row 1
 Warning	1292	Truncated incorrect time value: '-9223372036854775808'
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b DECIMAL, c DOUBLE);
@@ -1196,12 +1196,12 @@ a	TIME(a)	TIME(b)	TIME(c)
 9	00:00:09	00:00:09	00:00:09.000000
 9000000	838:59:59	838:59:59	838:59:59.999999
 Warnings:
-Warning	1292	Incorrect time value: '-9000000' for column 'a' at row 1
-Warning	1292	Incorrect time value: '-9000000' for column 'b' at row 1
-Warning	1292	Incorrect time value: '-9000000' for column 'c' at row 1
-Warning	1292	Incorrect time value: '9000000' for column 'a' at row 6
-Warning	1292	Incorrect time value: '9000000' for column 'b' at row 6
-Warning	1292	Incorrect time value: '9000000' for column 'c' at row 6
+Warning	1292	Incorrect time value: '-9000000' for column `test`.`t1`.`a` at row 1
+Warning	1292	Incorrect time value: '-9000000' for column `test`.`t1`.`b` at row 1
+Warning	1292	Incorrect time value: '-9000000' for column `test`.`t1`.`c` at row 1
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`a` at row 6
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`b` at row 6
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`c` at row 6
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b DECIMAL, c DOUBLE);
 INSERT INTO t1 VALUES (0,0,0),(1,1,1),(9,9,9);
@@ -1213,9 +1213,9 @@ a	TIME(a)	TIME(b)	TIME(c)
 9	00:00:09	00:00:09	00:00:09.000000
 9000000	838:59:59	838:59:59	838:59:59.999999
 Warnings:
-Warning	1292	Incorrect time value: '9000000' for column 'a' at row 4
-Warning	1292	Incorrect time value: '9000000' for column 'b' at row 4
-Warning	1292	Incorrect time value: '9000000' for column 'c' at row 4
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`a` at row 4
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`b` at row 4
+Warning	1292	Incorrect time value: '9000000' for column `test`.`t1`.`c` at row 4
 DROP TABLE t1;
 #
 # MDEV-8862 Wrong field type for MAX(COALESCE(datetime_column))
@@ -2173,7 +2173,7 @@ Warning	1292	Truncated incorrect time value: 'z'
 CREATE TABLE t1 (t TIME);
 SET SESSION SQL_MODE='TRADITIONAL';
 INSERT INTO t1 VALUES ('0000-00-00 00:00:00'),('0000-00-00 00:00:00');
-ERROR 22007: Incorrect time value: '0000-00-00 00:00:00' for column 't' at row 1
+ERROR 22007: Incorrect time value: '0000-00-00 00:00:00' for column `test`.`t1`.`t` at row 1
 SET sql_mode=DEFAULT;
 DROP TABLE t1;
 #
diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result
index e1256ae5b0c..14fa13d59e2 100644
--- a/mysql-test/main/type_timestamp.result
+++ b/mysql-test/main/type_timestamp.result
@@ -766,7 +766,7 @@ SET sql_mode=DEFAULT;
 CREATE TABLE t1 (a TIMESTAMP DEFAULT '0000-00-00 00:00:00');
 SET sql_mode=TRADITIONAL;
 INSERT INTO t1 VALUES ('0000-00-00 00:00:00');
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
 INSERT INTO t1 VALUES ();
 ERROR 22007: Incorrect default value '0000-00-00 00:00:00' for column 'a'
 INSERT INTO t1 VALUES (DEFAULT);
@@ -807,7 +807,7 @@ CREATE TABLE t1 (a TIMESTAMP);;
 INSERT INTO t1 VALUES (0);
 SET sql_mode='TRADITIONAL';
 CREATE TABLE t2 AS SELECT * FROM t1;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t2`.`a` at row 1
 DROP TABLE t1;
 #
 # End of MDEV-8373 Zero date can be inserted in strict no-zero mode through CREATE TABLE AS SELECT timestamp_field
@@ -1112,9 +1112,9 @@ CREATE TABLE t1 (a TIMESTAMP, b TIMESTAMP);
 INSERT INTO t1 VALUES ('0000-00-00 00:00:00','0000-00-00 00:00:00');
 SET sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
 UPDATE t1 SET a=b;
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
 UPDATE t1 SET a=COALESCE(b);
-ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`a` at row 1
 DROP TABLE t1;
 SET sql_mode=DEFAULT;
 #
diff --git a/mysql-test/main/type_timestamp_round.result b/mysql-test/main/type_timestamp_round.result
index d6843a9fedf..7931aa0ff5b 100644
--- a/mysql-test/main/type_timestamp_round.result
+++ b/mysql-test/main/type_timestamp_round.result
@@ -107,7 +107,7 @@ SET time_zone='Europe/Moscow';
 CREATE TABLE t1 (a TIMESTAMP);
 INSERT INTO t1 VALUES ('2010-03-28 01:59:59.0' /* Winter time */);
 INSERT INTO t1 VALUES ('2010-03-28 01:59:59.9' /* Rounds to the DST gap */);
-ERROR 22007: Incorrect datetime value: '2010-03-28 01:59:59.9' for column 'a' at row 1
+ERROR 22007: Incorrect datetime value: '2010-03-28 01:59:59.9' for column `test`.`t1`.`a` at row 1
 SELECT * FROM t1;
 a
 2010-03-28 01:59:59
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index 275acc97d8e..317f02cadaa 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -1280,10 +1280,10 @@ load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields term
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
 Note	1265	Data truncated for column 'a' at row 2
-Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
+Warning	1366	Incorrect integer value: 'error      ' for column `test`.`t1`.`a` at row 3
 Warning	1369	CHECK OPTION failed `test`.`v1`
 Note	1265	Data truncated for column 'a' at row 3
-Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 4
+Warning	1366	Incorrect integer value: 'wrong end  ' for column `test`.`t1`.`a` at row 4
 Warning	1369	CHECK OPTION failed `test`.`v1`
 select * from t1 order by a,b;
 a	b
diff --git a/mysql-test/main/warnings.result b/mysql-test/main/warnings.result
index 7c7e049ff2d..db3ef5f17d2 100644
--- a/mysql-test/main/warnings.result
+++ b/mysql-test/main/warnings.result
@@ -31,19 +31,19 @@ Error	1064	You have an error in your SQL syntax; check the manual that correspon
 insert into t1 values (1);
 insert ignore into t1 values ("hej");
 Warnings:
-Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
+Warning	1366	Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
 insert ignore into t1 values ("hej"),("då");
 Warnings:
-Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'då' for column 'a' at row 2
+Warning	1366	Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect integer value: 'då' for column `test`.`t1`.`a` at row 2
 set SQL_WARNINGS=1;
 insert ignore into t1 values ("hej");
 Warnings:
-Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
+Warning	1366	Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
 insert ignore into t1 values ("hej"),("då");
 Warnings:
-Warning	1366	Incorrect integer value: 'hej' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'då' for column 'a' at row 2
+Warning	1366	Incorrect integer value: 'hej' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect integer value: 'då' for column `test`.`t1`.`a` at row 2
 drop table t1;
 set SQL_WARNINGS=0;
 drop temporary table if exists not_exists;
@@ -171,44 +171,44 @@ create table t1 (a int);
 insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 update ignore t1 set a='abc';
 Warnings:
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 2
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 3
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 4
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 5
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 6
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 7
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 8
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 9
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 10
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
 show warnings limit 2, 1;
 Level	Code	Message
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 3
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
 show warnings limit 0, 10;
 Level	Code	Message
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 1
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 2
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 3
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 4
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 5
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 6
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 7
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 8
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 9
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 10
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 2
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 3
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 4
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 5
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 6
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 7
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 8
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 9
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
 show warnings limit 9, 1;
 Level	Code	Message
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 10
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
 show warnings limit 10, 1;
 Level	Code	Message
 show warnings limit 9, 2;
 Level	Code	Message
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 10
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 10
 show warnings limit 0, 0;
 Level	Code	Message
 show warnings limit 1;
 Level	Code	Message
-Warning	1366	Incorrect integer value: 'abc' for column 'a' at row 1
+Warning	1366	Incorrect integer value: 'abc' for column `test`.`t1`.`a` at row 1
 show warnings limit 0;
 Level	Code	Message
 show warnings limit 1, 0;
@@ -254,13 +254,13 @@ SELECT f1 INTO x FROM t3 LIMIT 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning	1366	Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
 CALL sp2();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning	1366	Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
 CALL sp3();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning	1366	Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
 SET sql_mode = DEFAULT;
 DROP PROCEDURE IF EXISTS sp1;
 SET sql_mode = '';
@@ -271,7 +271,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`' for column 'x' at row 1
+Warning	1366	Incorrect decimal value: 'a`' for column ``.``.`x` at row 1
 SET sql_mode = DEFAULT;
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result
index 0321b8a2787..ce8c1311222 100644
--- a/mysql-test/main/win.result
+++ b/mysql-test/main/win.result
@@ -3458,6 +3458,19 @@ deallocate prepare stmt;
 drop table t1;
 drop view v1;
 #
+# MDEV-17676: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init
+#
+CREATE TABLE t1 (b1 text NOT NULL);
+INSERT INTO t1 VALUES  ('2'),('1');
+EXPLAIN
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+MIN(b1) OVER ()
+1
+drop table t1;
+#
 # Start of 10.3 tests
 #
 #
diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test
index 14d778ceca6..0254667579a 100644
--- a/mysql-test/main/win.test
+++ b/mysql-test/main/win.test
@@ -2218,6 +2218,17 @@ drop table t1;
 drop view v1;
 
 --echo #
+--echo # MDEV-17676: Assertion `inited==NONE || (inited==RND && scan)' failed in handler::ha_rnd_init
+--echo #
+
+CREATE TABLE t1 (b1 text NOT NULL);
+INSERT INTO t1 VALUES  ('2'),('1');
+EXPLAIN
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+SELECT DISTINCT MIN(b1) OVER () FROM t1;
+drop table t1;
+
+--echo #
 --echo # Start of 10.3 tests
 --echo #