Fixes after Serg's review of %M extenstions

- Changed output to be error "error-text" instead of error - error-text


extra/perror.c:
  Move my_handler_errors.h into include
include/my_handler_errors.h:
  Move my_handler_errors.h into include
mysql-test/r/errors.result:
  Updated result
mysql-test/r/innodb_mysql_sync.result:
  Updated result
mysql-test/r/myisam-system.result:
  Updated result
mysql-test/r/myisampack.result:
  Updated result
mysql-test/r/partition_innodb_plugin.result:
  Updated result
mysql-test/r/ps_1general.result:
  Updated result
mysql-test/r/trigger.result:
  Updated result
mysql-test/r/type_bit.result:
  Updated result
mysql-test/r/type_bit_innodb.result:
  Updated result
mysql-test/r/type_blob.result:
  Updated result
mysql-test/suite/archive/archive.result:
  Updated result
mysql-test/suite/binlog/r/binlog_index.result:
  Updated result
mysql-test/suite/binlog/r/binlog_ioerr.result:
  Updated result
mysql-test/suite/csv/csv.result:
  Updated result
mysql-test/suite/engines/iuds/r/type_bit_iuds.result:
  Updated result
mysql-test/suite/federated/federated_bug_35333.result:
  Updated result
mysql-test/suite/innodb/r/innodb-create-options.result:
  Updated result
mysql-test/suite/innodb/r/innodb-index.result:
  Updated result
mysql-test/suite/innodb/r/innodb-zip.result:
  Updated result
mysql-test/suite/innodb/r/innodb.result:
  Updated result
mysql-test/suite/innodb/r/innodb_bug13635833.result:
  Updated result
mysql-test/suite/innodb/r/innodb_bug21704.result:
  Updated result
mysql-test/suite/innodb/r/innodb_bug46000.result:
  Updated result
mysql-test/suite/parts/r/partition_bit_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_bit_myisam.result:
  Updated result
mysql-test/suite/percona/percona_innodb_fake_changes.result:
  Updated result
mysql-test/suite/perfschema/r/misc.result:
  Updated result
mysql-test/suite/perfschema/r/privilege.result:
  Updated result
mysql-test/suite/rpl/r/rpl_EE_err.result:
  Updated result
mysql-test/suite/rpl/r/rpl_binlog_errors.result:
  Updated result
mysql-test/suite/rpl/r/rpl_drop_db.result:
  Updated result
sql/share/errmsg-utf8.txt:
  Removed 'column' from error text that was used in different context
strings/my_vsnprintf.c:
  Move my_handler_errors.h into include
  Minor cleanups
  Changed output of %M to be error "error-text" instead of error - error-text
unittest/mysys/my_vsnprintf-t.c:
  Updated error text

31 files changed, 254 insertions, 254 deletions

diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index 3e1848b950f..8560e6176c4 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/r/errors.result
@@ -24,7 +24,7 @@ select count(*),b from t1;
 ERROR 42S22: Unknown column 'b' in 'field list'
 drop table t1;
 create table t1 (a int(256));
-ERROR 42000: Display width out of range for column 'a' (max = 255)
+ERROR 42000: Display width out of range for 'a' (max = 255)
 set sql_mode='traditional';
 create table t1 (a varchar(66000));
 ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead
diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result
index a4af3a2a903..044e582ceb6 100644
--- a/mysql-test/r/innodb_mysql_sync.result
+++ b/mysql-test/r/innodb_mysql_sync.result
@@ -18,10 +18,10 @@ SET DEBUG_SYNC='now SIGNAL table_altered';
 # Complete optimization
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
-test.t1	optimize	error	Got error -1 - Internal error < 0 (Not system error) from storage engine
+test.t1	optimize	error	Got error -1 "Internal error < 0 (Not system error)" from storage engine
 test.t1	optimize	status	Operation failed
 Warnings:
-Error	1030	Got error -1 - Internal error < 0 (Not system error) from storage engine
+Error	1030	Got error -1 "Internal error < 0 (Not system error)" from storage engine
 DROP TABLE t1;
 SET DEBUG_SYNC='RESET';
 #
diff --git a/mysql-test/r/myisam-system.result b/mysql-test/r/myisam-system.result
index 78480b103d6..924e7885814 100644
--- a/mysql-test/r/myisam-system.result
+++ b/mysql-test/r/myisam-system.result
@@ -2,7 +2,7 @@ drop table if exists t1,t2;
 create table t1 (a int) engine=myisam;
 drop table if exists t1;
 Warnings:
-Warning	2	Can't find file: 't1' (errno: 2 - No such file or directory)
+Warning	2	Can't find file: 't1' (errno: 2 "No such file or directory")
 create table t1 (a int) engine=myisam;
 drop table t1;
 Got one of the listed errors
diff --git a/mysql-test/r/myisampack.result b/mysql-test/r/myisampack.result
index d095564d6f0..2cefa385048 100644
--- a/mysql-test/r/myisampack.result
+++ b/mysql-test/r/myisampack.result
@@ -113,7 +113,7 @@ ERROR 42S02: Table 'test.t3' doesn't exist
 # ===== myisampack.4 =====
 #Tests the myisampack join operation with an existing destination .frm,.MYI,.MDI 
 #the command should fail with exit status 2
-myisampack: Can't create/write to file (Errcode: 17 - File exists)
+myisampack: Can't create/write to file (Errcode: 17 "File exists")
 Aborted: file is not compressed
 DROP TABLE t1,t2,t3;
 DROP TABLE mysql_db1.t1;
diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result
index 28edd2a6118..cccfe5732ea 100644
--- a/mysql-test/r/partition_innodb_plugin.result
+++ b/mysql-test/r/partition_innodb_plugin.result
@@ -67,7 +67,7 @@ LOCK TABLE t1 WRITE;
 # ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
 # are incompatible with innodb_file_per_table = OFF;
 ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
-ERROR HY000: Got error 1478
+ERROR HY000: Got error 1478 "Unknown error 1478" from storage engine
 t1#P#p0.ibd
 t1.frm
 t1.par
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 82f3ff7690c..045a62a1d5a 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -533,7 +533,7 @@ drop table t2;
 prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
 create table t5 (a int) ;
 execute stmt1 ;
-ERROR HY000: Can't find file: './test/t7' (errno: 2 - No such file or directory)
+ERROR HY000: Can't find file: './test/t7' (errno: 2 "No such file or directory")
 create table t7 (a int) ;
 execute stmt1 ;
 execute stmt1 ;
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 77561250119..63193bdedbc 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -967,7 +967,7 @@ trigger_schema	trigger_name	event_object_schema	event_object_table	action_statem
 test	t1_bi	test	t1	set @a:=new.id
 test	t1_ai	test	t1	set @b:=new.id
 rename table t1 to t2;
-ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 13 - Permission denied)
+ERROR HY000: Can't create/write to file './test/t1_ai.TRN~' (Errcode: 13 "Permission denied")
 insert into t1 values (102);
 select @a, @b;
 @a	@b
diff --git a/mysql-test/r/type_bit.result b/mysql-test/r/type_bit.result
index f2f21b90e06..e6f4db26c23 100644
--- a/mysql-test/r/type_bit.result
+++ b/mysql-test/r/type_bit.result
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001';
 32769
 drop table if exists t1,t2;
 create table t1 (a bit(65));
-ERROR 42000: Display width out of range for column 'a' (max = 64)
+ERROR 42000: Display width out of range for 'a' (max = 64)
 create table t1 (a bit(0));
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/r/type_bit_innodb.result b/mysql-test/r/type_bit_innodb.result
index bd9bbc92d4b..9bdd8658690 100644
--- a/mysql-test/r/type_bit_innodb.result
+++ b/mysql-test/r/type_bit_innodb.result
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001';
 32769
 drop table if exists t1;
 create table t1 (a bit(65)) engine=innodb;
-ERROR 42000: Display width out of range for column 'a' (max = 64)
+ERROR 42000: Display width out of range for 'a' (max = 64)
 create table t1 (a bit(0)) engine=innodb;
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index a478af0f17d..fc2e0854620 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -833,7 +833,7 @@ drop table b15776;
 create table b15776 (data blob(4294967295));
 drop table b15776;
 create table b15776 (data blob(4294967296));
-ERROR 42000: Display width out of range for column 'data' (max = 4294967295)
+ERROR 42000: Display width out of range for 'data' (max = 4294967295)
 CREATE TABLE b15776 (a blob(2147483647), b blob(2147483648), c blob(4294967295), a1 text(2147483647), b1 text(2147483648), c1 text(4294967295) );
 show columns from b15776;
 Field	Type	Null	Key	Default	Extra
@@ -845,13 +845,13 @@ b1	longtext	YES		NULL
 c1	longtext	YES		NULL	
 drop table b15776;
 CREATE TABLE b15776 (a blob(4294967296));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a text(4294967296));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a blob(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a text(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a int(0));
 INSERT INTO b15776 values (NULL), (1), (42), (654);
 SELECT * from b15776 ORDER BY a;
@@ -866,7 +866,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 CREATE TABLE b15776 (a int(255));
 DROP TABLE b15776;
 CREATE TABLE b15776 (a int(256));
-ERROR 42000: Display width out of range for column 'a' (max = 255)
+ERROR 42000: Display width out of range for 'a' (max = 255)
 CREATE TABLE b15776 (data blob(-1));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1
 CREATE TABLE b15776 (a char(2147483647));
@@ -876,7 +876,7 @@ ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT
 CREATE TABLE b15776 (a char(4294967295));
 ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead
 CREATE TABLE b15776 (a char(4294967296));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a year(4294967295));
 INSERT INTO b15776 VALUES (42);
 SELECT * FROM b15776;
@@ -884,7 +884,7 @@ a
 2042
 DROP TABLE b15776;
 CREATE TABLE b15776 (a year(4294967296));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a year(0));
 DROP TABLE b15776;
 CREATE TABLE b15776 (a year(-2));
@@ -894,17 +894,17 @@ ERROR 42000: Too big precision 4294967294 specified for 'a'. Maximum is 6.
 CREATE TABLE b15776 (a timestamp(4294967295));
 ERROR 42000: Too big precision 4294967295 specified for 'a'. Maximum is 6.
 CREATE TABLE b15776 (a timestamp(4294967296));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a timestamp(-1));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1
 CREATE TABLE b15776 (a timestamp(-2));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2))' at line 1
 CREATE TABLE b15776 (a int(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for 'a' (max = 4294967295)
 CREATE TABLE b15776 select cast(null as char(4294967295));
 show columns from b15776;
 Field	Type	Null	Key	Default	Extra
@@ -930,11 +930,11 @@ explain select cast(1 as binary(4294967295));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain select cast(1 as char(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select cast(1 as nchar(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select cast(1 as binary(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select cast(1 as decimal(-1));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1
 explain select cast(1 as decimal(64, 30));
@@ -950,23 +950,23 @@ explain select convert(1, char(4294967295));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain select convert(1, char(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select convert(1, nchar(4294967295));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain select convert(1, nchar(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select convert(1, nchar(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select convert(1, binary(4294967295));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain select convert(1, binary(4294967296));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 explain select convert(1, binary(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for column '1' (max = 4294967295)
+ERROR 42000: Display width out of range for '1' (max = 4294967295)
 End of 5.0 tests
 CREATE TABLE t1(id INT NOT NULL);
 CREATE TABLE t2(id INT NOT NULL, c TEXT NOT NULL);
diff --git a/mysql-test/suite/archive/archive.result b/mysql-test/suite/archive/archive.result
index f6978fe9685..98608a95f37 100644
--- a/mysql-test/suite/archive/archive.result
+++ b/mysql-test/suite/archive/archive.result
@@ -12754,7 +12754,7 @@ DROP TABLE t1;
 CREATE TABLE t1(a INT) ENGINE=ARCHIVE;
 FLUSH TABLE t1;
 SELECT * FROM t1;
-ERROR HY000: Can't find file: 't1' (errno: 2 - No such file or directory)
+ERROR HY000: Can't find file: 't1' (errno: 2 "No such file or directory")
 DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 #
diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result
index b92a3540cf2..8cdca861737 100644
--- a/mysql-test/suite/binlog/r/binlog_index.result
+++ b/mysql-test/suite/binlog/r/binlog_index.result
@@ -134,7 +134,7 @@ master-bin.000011
 # fault_injection_registering_index
 SET SESSION debug_dbug="+d,fault_injection_registering_index";
 flush logs;
-ERROR HY000: Can't open file: 'master-bin.000012' (errno: 1 - Operation not permitted)
+ERROR HY000: Can't open file: 'master-bin.000012' (errno: 1 "Operation not permitted")
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
@@ -159,7 +159,7 @@ master-bin.000012
 # fault_injection_updating_index
 SET SESSION debug_dbug="+d,fault_injection_updating_index";
 flush logs;
-ERROR HY000: Can't open file: 'master-bin.000013' (errno: 1 - Operation not permitted)
+ERROR HY000: Can't open file: 'master-bin.000013' (errno: 1 "Operation not permitted")
 SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index');
 SELECT @index;
 @index
diff --git a/mysql-test/suite/binlog/r/binlog_ioerr.result b/mysql-test/suite/binlog/r/binlog_ioerr.result
index 3577b6a0a74..f8e2d189f57 100644
--- a/mysql-test/suite/binlog/r/binlog_ioerr.result
+++ b/mysql-test/suite/binlog/r/binlog_ioerr.result
@@ -4,9 +4,9 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
 INSERT INTO t1 VALUES(0);
 SET SESSION debug_dbug='+d,fail_binlog_write_1';
 INSERT INTO t1 VALUES(1);
-ERROR HY000: Error writing file 'master-bin' (errno: 28 - No space left on device)
+ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device")
 INSERT INTO t1 VALUES(2);
-ERROR HY000: Error writing file 'master-bin' (errno: 28 - No space left on device)
+ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device")
 SET SESSION debug_dbug='';
 INSERT INTO t1 VALUES(3);
 SELECT * FROM t1;
diff --git a/mysql-test/suite/csv/csv.result b/mysql-test/suite/csv/csv.result
index 6c029ae2f46..d81cf6e28bc 100644
--- a/mysql-test/suite/csv/csv.result
+++ b/mysql-test/suite/csv/csv.result
@@ -5197,7 +5197,7 @@ drop table t1;
 create table bug15205 (val int(11) not null) engine=csv;
 create table bug15205_2 (val int(11) not null) engine=csv;
 select * from bug15205;
-ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 2 - No such file or directory)
+ERROR HY000: Can't get stat of './test/bug15205.CSV' (Errcode: 2 "No such file or directory")
 select * from bug15205_2;
 val
 select * from bug15205;
@@ -5379,7 +5379,7 @@ ERROR 42000: The storage engine for the table doesn't support nullable columns
 SHOW WARNINGS;
 Level	Code	Message
 Error	1178	The storage engine for the table doesn't support nullable columns
-Error	1005	Can't create table 'test.t1' (errno: 138 - Unsupported extension used for table)
+Error	1005	Can't create table 'test.t1' (errno: 138 "Unsupported extension used for table")
 create table t1 (c1 tinyblob not null) engine=csv;
 insert into t1 values("This");
 update t1 set c1="That" where c1="This";
@@ -5392,7 +5392,7 @@ drop table t1;
 create table t1 (a int not null) engine=csv;
 lock tables t1 read;
 select * from t1;
-ERROR HY000: File 'MYSQLD_DATADIR/test/t1.CSV' not found (Errcode: 2 - No such file or directory)
+ERROR HY000: File 'MYSQLD_DATADIR/test/t1.CSV' not found (Errcode: 2 "No such file or directory")
 unlock tables;
 drop table t1;
 CREATE TABLE t1 (e enum('foo','bar') NOT NULL) ENGINE = CSV;
diff --git a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
index 763b3003b9d..47e5234f795 100644
--- a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
+++ b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
@@ -49,7 +49,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 000
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -854,7 +854,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 000
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -1704,7 +1704,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -2619,7 +2619,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -3692,7 +3692,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -5211,7 +5211,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -7252,7 +7252,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -10392,7 +10392,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -11224,7 +11224,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -12029,7 +12029,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -12879,7 +12879,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -13794,7 +13794,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -14867,7 +14867,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -16386,7 +16386,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -18427,7 +18427,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -21567,7 +21567,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -22405,7 +22405,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -23216,7 +23216,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -24066,7 +24066,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -24981,7 +24981,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -26054,7 +26054,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -27573,7 +27573,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -29614,7 +29614,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -32754,7 +32754,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -33592,7 +33592,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -34403,7 +34403,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -35259,7 +35259,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -36174,7 +36174,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -37247,7 +37247,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -38766,7 +38766,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -40807,7 +40807,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -43947,7 +43947,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -44785,7 +44785,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -45596,7 +45596,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -46452,7 +46452,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -47373,7 +47373,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -48452,7 +48452,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -49971,7 +49971,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -52012,7 +52012,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -55152,7 +55152,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -55992,7 +55992,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -56805,7 +56805,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -57663,7 +57663,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -58586,7 +58586,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -59667,7 +59667,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -61194,7 +61194,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -63237,7 +63237,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -66379,7 +66379,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -67216,7 +67216,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -68026,7 +68026,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -68881,7 +68881,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -69801,7 +69801,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -70879,7 +70879,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -72403,7 +72403,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -74449,7 +74449,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -77588,7 +77588,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
@@ -78425,7 +78425,7 @@ SELECT CONCAT(BIN(c1),BIN(c2),BIN(c3)) FROM t2;
 CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(0) NOT NULL PRIMARY KEY, c2  BIT(0));
@@ -79235,7 +79235,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111
 111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(1) NOT NULL PRIMARY KEY, c2  BIT(1));
@@ -80090,7 +80090,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111
 111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(2) NOT NULL PRIMARY KEY, c2  BIT(2));
@@ -81010,7 +81010,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111
 111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(4) NOT NULL PRIMARY KEY, c2  BIT(4));
@@ -82088,7 +82088,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111
 111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(8) NOT NULL PRIMARY KEY, c2  BIT(8));
@@ -83612,7 +83612,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(16) NOT NULL PRIMARY KEY, c2  BIT(16));
@@ -85658,7 +85658,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(32) NOT NULL PRIMARY KEY, c2  BIT(32));
@@ -88803,7 +88803,7 @@ CONCAT(BIN(c1),BIN(c2),BIN(c3))
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
 CREATE TABLE t3 (c1 BIT(65));
-ERROR 42000: Display width out of range for column 'c1' (max = 64)
+ERROR 42000: Display width out of range for 'c1' (max = 64)
 CREATE TABLE t4(i INT, b BIT NOT NULL);
 ALTER TABLE t4 ADD PRIMARY KEY (i);
 CREATE TABLE t5(c1  BIT(64) NOT NULL PRIMARY KEY, c2  BIT(64));
diff --git a/mysql-test/suite/federated/federated_bug_35333.result b/mysql-test/suite/federated/federated_bug_35333.result
index 79ee497b926..74f6f6e8f02 100644
--- a/mysql-test/suite/federated/federated_bug_35333.result
+++ b/mysql-test/suite/federated/federated_bug_35333.result
@@ -24,12 +24,12 @@ CREATE TABLE t1 (c1 int) ENGINE=MYISAM;
 SELECT TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, TABLE_ROWS, DATA_LENGTH, TABLE_COMMENT
 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_ROWS	DATA_LENGTH	TABLE_COMMENT
-test	t1	BASE TABLE	NULL	NULL	NULL	NULL	Can't find file: 't1' (errno: 2 - No such file or directory)
+test	t1	BASE TABLE	NULL	NULL	NULL	NULL	Can't find file: 't1' (errno: 2 "No such file or directory")
 Warnings:
-Warning	1017	Can't find file: 't1' (errno: 2 - No such file or directory)
+Warning	1017	Can't find file: 't1' (errno: 2 "No such file or directory")
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1017	Can't find file: 't1' (errno: 2 - No such file or directory)
+Warning	1017	Can't find file: 't1' (errno: 2 "No such file or directory")
 DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 #
diff --git a/mysql-test/suite/innodb/r/innodb-create-options.result b/mysql-test/suite/innodb/r/innodb-create-options.result
index 94c84fcf60f..7d49667a1e9 100644
--- a/mysql-test/suite/innodb/r/innodb-create-options.result
+++ b/mysql-test/suite/innodb/r/innodb-create-options.result
@@ -10,11 +10,11 @@ Note	1051	Unknown table 't1'
 #         'FIXED' is sent to InnoDB since it is used by MyISAM.
 #         But it is an invalid mode in InnoDB
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
@@ -46,11 +46,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	
@@ -58,23 +58,23 @@ t1	Compact
 #         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
 Level	Code	Message
@@ -104,29 +104,29 @@ t1	Compressed	key_block_size=16
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT );
 ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
 SHOW WARNINGS;
 Level	Code	Message
@@ -146,11 +146,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Compact	row_format=COMPACT
 ALTER TABLE t1 KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -158,11 +158,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Redundant	row_format=REDUNDANT
 ALTER TABLE t1 KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
 SHOW WARNINGS;
 Level	Code	Message
@@ -170,11 +170,11 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
 t1	Dynamic	row_format=DYNAMIC
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
 Level	Code	Message
@@ -212,23 +212,23 @@ t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
 Level	Code	Message
@@ -250,11 +250,11 @@ t1	Compact	row_format=COMPACT
 # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
 #         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
 #         and that they can be set to default values during strict mode.
@@ -263,23 +263,23 @@ DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -298,34 +298,34 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
 Level	Code	Message
 ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SET GLOBAL innodb_file_format=Barracuda;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_format=Antelope;
 ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
@@ -340,23 +340,23 @@ SET GLOBAL innodb_file_format=Barracuda;
 SET GLOBAL innodb_file_per_table=OFF;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -375,23 +375,23 @@ CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
 SHOW WARNINGS;
 Level	Code	Message
 ALTER TABLE t1 KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=COMPACT;
 SHOW WARNINGS;
 Level	Code	Message
@@ -415,12 +415,12 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
 SET GLOBAL innodb_file_per_table=OFF;
 ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+Error	1005	Can't create table '#sql-temporary' (errno: 1478 "Unknown error 1478")
 ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
 Level	Code	Message
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result
index 1b0c278a8ad..0f004772153 100644
--- a/mysql-test/suite/innodb/r/innodb-index.result
+++ b/mysql-test/suite/innodb/r/innodb-index.result
@@ -545,7 +545,7 @@ t4	CREATE TABLE `t4` (
   CONSTRAINT `dc` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t3 add constraint dc foreign key (a) references t1(a);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 121 - Duplicate key on write or update)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 121 "Duplicate key on write or update")
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -578,7 +578,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 drop index dc on t4;
 ERROR 42000: Can't DROP 'dc'; check that column/key exists
 alter table t3 drop foreign key dc;
-ERROR HY000: Error on rename of './test/t3' to '#sql2-temporary' (errno: 152 - Cannot delete a parent row)
+ERROR HY000: Error on rename of './test/t3' to '#sql2-temporary' (errno: 152 "Cannot delete a parent row")
 alter table t4 drop foreign key dc;
 select * from t2;
 a	b	c	d	e
@@ -1146,17 +1146,17 @@ PRIMARY KEY (c1)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL;
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);
-ERROR HY000: Can't create table '#sql-temporary' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table '#sql-temporary' (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca
 FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1);
 SHOW CREATE TABLE t1;
diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result
index d71ae30eaed..adb7e58d340 100644
--- a/mysql-test/suite/innodb/r/innodb-zip.result
+++ b/mysql-test/suite/innodb/r/innodb-zip.result
@@ -193,11 +193,11 @@ drop table t1;
 set innodb_strict_mode = on;
 create table t1 (id int primary key) engine = innodb key_block_size = 0;
 create table t2 (id int primary key) engine = innodb key_block_size = 9;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 create table t3 (id int primary key) engine = innodb key_block_size = 1;
 create table t4 (id int primary key) engine = innodb key_block_size = 2;
 create table t5 (id int primary key) engine = innodb key_block_size = 4;
@@ -225,25 +225,25 @@ create table t1 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compressed;
 create table t2 (id int primary key) engine = innodb
 key_block_size = 8 row_format = redundant;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 create table t3 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compact;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+ERROR HY000: Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
+Error	1005	Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 create table t4 (id int primary key) engine = innodb
 key_block_size = 8 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+ERROR HY000: Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
+Error	1005	Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 create table t5 (id int primary key) engine = innodb
 key_block_size = 8 row_format = default;
 SELECT table_schema, table_name, row_format, data_length, index_length
@@ -254,74 +254,74 @@ test	t5	Compressed	8192	0
 drop table t1, t5;
 create table t1 (id int primary key) engine = innodb
 key_block_size = 9 row_format = redundant;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = compact;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
 Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 SELECT table_schema, table_name, row_format, data_length, index_length
 FROM information_schema.tables WHERE engine='innodb';
 table_schema	table_name	row_format	data_length	index_length
 set global innodb_file_per_table = off;
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+ERROR HY000: Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
+Error	1005	Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+ERROR HY000: Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
+Error	1005	Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+ERROR HY000: Can't create table 'test.t5' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
+Error	1005	Can't create table 'test.t5' (errno: 1478 "Unknown error 1478")
 create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 1478)
+ERROR HY000: Can't create table 'test.t6' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t6' (errno: 1478)
+Error	1005	Can't create table 'test.t6' (errno: 1478 "Unknown error 1478")
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 1478)
+ERROR HY000: Can't create table 'test.t7' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t7' (errno: 1478)
+Error	1005	Can't create table 'test.t7' (errno: 1478 "Unknown error 1478")
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
 SELECT table_schema, table_name, row_format, data_length, index_length
@@ -333,47 +333,47 @@ drop table t8, t9;
 set global innodb_file_per_table = on;
 set global innodb_file_format = `0`;
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+ERROR HY000: Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
+Error	1005	Can't create table 'test.t1' (errno: 1478 "Unknown error 1478")
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+ERROR HY000: Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
+Error	1005	Can't create table 'test.t2' (errno: 1478 "Unknown error 1478")
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+ERROR HY000: Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
+Error	1005	Can't create table 'test.t3' (errno: 1478 "Unknown error 1478")
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+ERROR HY000: Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
+Error	1005	Can't create table 'test.t4' (errno: 1478 "Unknown error 1478")
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+ERROR HY000: Can't create table 'test.t5' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
+Error	1005	Can't create table 'test.t5' (errno: 1478 "Unknown error 1478")
 create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 1478)
+ERROR HY000: Can't create table 'test.t6' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t6' (errno: 1478)
+Error	1005	Can't create table 'test.t6' (errno: 1478 "Unknown error 1478")
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 1478)
+ERROR HY000: Can't create table 'test.t7' (errno: 1478 "Unknown error 1478")
 show warnings;
 Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t7' (errno: 1478)
+Error	1005	Can't create table 'test.t7' (errno: 1478 "Unknown error 1478")
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
 SELECT table_schema, table_name, row_format, data_length, index_length
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index f5e55dca1b8..510ce63fdae 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -2523,13 +2523,13 @@ drop table t1;
 set foreign_key_checks=0;
 create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;
 create table t1(a char(10) primary key, b varchar(20)) engine = innodb;
-ERROR HY000: Can't create table 'test.t1' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table 'test.t1' (errno: 150 "Foreign key constraint is incorrectly formed")
 set foreign_key_checks=1;
 drop table t2;
 set foreign_key_checks=0;
 create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;
-ERROR HY000: Can't create table 'test.t2' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Can't create table 'test.t2' (errno: 150 "Foreign key constraint is incorrectly formed")
 set foreign_key_checks=1;
 drop table t1;
 set foreign_key_checks=0;
@@ -2549,7 +2549,7 @@ set foreign_key_checks=0;
 create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;
 create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;
 rename table t3 to t1;
-ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150 "Foreign key constraint is incorrectly formed")
 set foreign_key_checks=1;
 drop table t2,t3;
 create table t1(a int primary key) row_format=redundant engine=innodb;
@@ -2976,7 +2976,7 @@ INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
 ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1 (a) ON DELETE SET NULL;
 ALTER TABLE t2 MODIFY a INT NOT NULL;
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150 "Foreign key constraint is incorrectly formed")
 DELETE FROM t1;
 DROP TABLE t2,t1;
 CREATE TABLE t1 (a VARCHAR(5) COLLATE utf8_unicode_ci PRIMARY KEY)
diff --git a/mysql-test/suite/innodb/r/innodb_bug13635833.result b/mysql-test/suite/innodb/r/innodb_bug13635833.result
index 1841757aad5..a92b57cc824 100644
--- a/mysql-test/suite/innodb/r/innodb_bug13635833.result
+++ b/mysql-test/suite/innodb/r/innodb_bug13635833.result
@@ -37,7 +37,7 @@ SET DEBUG_SYNC='innodb_row_update_for_mysql_begin
 SET DEBUG_SYNC='innodb_dml_cascade_dict_unfreeze SIGNAL dict_unfreeze
                             WAIT_FOR  foreign_free_cache';
 update ignore t1 set f1 = 20;
-ERROR HY000: Error on rename of './test/t2' to '#sql2-temporary' (errno: 182 - Table is being used in foreign key check)
+ERROR HY000: Error on rename of './test/t2' to '#sql2-temporary' (errno: 182 "Table is being used in foreign key check")
 SET DEBUG_SYNC='now SIGNAL foreign_free_cache';
 drop table t2;
 drop table t1;
diff --git a/mysql-test/suite/innodb/r/innodb_bug21704.result b/mysql-test/suite/innodb/r/innodb_bug21704.result
index f7800acbff8..3a6b38d50da 100644
--- a/mysql-test/suite/innodb/r/innodb_bug21704.result
+++ b/mysql-test/suite/innodb/r/innodb_bug21704.result
@@ -22,7 +22,7 @@ INSERT INTO t3 VALUES (1,1,1),(2,2,2),(3,3,3);
 # Test renaming the column in the referenced table.
 
 ALTER TABLE t1 CHANGE a c INT;
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t1' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t1' (errno: 150 "Foreign key constraint is incorrectly formed")
 # Ensure that online column rename works.
 ALTER TABLE t1 CHANGE b c INT;
 affected rows: 3
@@ -31,7 +31,7 @@ info: Records: 3  Duplicates: 0  Warnings: 0
 # Test renaming the column in the referencing table
 
 ALTER TABLE t2 CHANGE a c INT;
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t2' (errno: 150 "Foreign key constraint is incorrectly formed")
 # Ensure that online column rename works.
 ALTER TABLE t2 CHANGE b c INT;
 affected rows: 3
@@ -40,9 +40,9 @@ info: Records: 3  Duplicates: 0  Warnings: 0
 # Test with self-referential constraints
 
 ALTER TABLE t3 CHANGE a d INT;
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150 "Foreign key constraint is incorrectly formed")
 ALTER TABLE t3 CHANGE b d INT;
-ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150 - Foreign key constraint is incorrectly formed)
+ERROR HY000: Error on rename of '#sql-temporary' to './test/t3' (errno: 150 "Foreign key constraint is incorrectly formed")
 # Ensure that online column rename works.
 ALTER TABLE t3 CHANGE c d INT;
 affected rows: 3
diff --git a/mysql-test/suite/innodb/r/innodb_bug46000.result b/mysql-test/suite/innodb/r/innodb_bug46000.result
index 5b407fca427..9ee0c935d71 100644
--- a/mysql-test/suite/innodb/r/innodb_bug46000.result
+++ b/mysql-test/suite/innodb/r/innodb_bug46000.result
@@ -6,7 +6,7 @@ show warnings;
 Level	Code	Message
 Warning	1280	Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index.
 Error	1280	Incorrect index name 'GEN_CLUST_INDEX'
-Error	1005	Can't create table 'test.bug46000' (errno: -1 - Internal error < 0 (Not system error))
+Error	1005	Can't create table 'test.bug46000' (errno: -1 "Internal error < 0 (Not system error)")
 create table bug46000(id int) engine=innodb;
 create index GEN_CLUST_INDEX on bug46000(id);
 ERROR 42000: Incorrect index name 'GEN_CLUST_INDEX'
diff --git a/mysql-test/suite/parts/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result
index a9ae917f13d..2e802d85b1f 100644
--- a/mysql-test/suite/parts/r/partition_bit_innodb.result
+++ b/mysql-test/suite/parts/r/partition_bit_innodb.result
@@ -1,7 +1,7 @@
 SET @max_row = 20;
 drop table if exists t1;
 create table t1 (a bit(65), primary key (a)) engine='INNODB' partition by key (a);
-ERROR 42000: Display width out of range for column 'a' (max = 64)
+ERROR 42000: Display width out of range for 'a' (max = 64)
 create table t1 (a bit(0), primary key (a)) engine='INNODB' partition by key (a);
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/suite/parts/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result
index 680845c9971..c396cf66521 100644
--- a/mysql-test/suite/parts/r/partition_bit_myisam.result
+++ b/mysql-test/suite/parts/r/partition_bit_myisam.result
@@ -1,7 +1,7 @@
 SET @max_row = 20;
 drop table if exists t1;
 create table t1 (a bit(65), primary key (a)) engine='MyISAM' partition by key (a);
-ERROR 42000: Display width out of range for column 'a' (max = 64)
+ERROR 42000: Display width out of range for 'a' (max = 64)
 create table t1 (a bit(0), primary key (a)) engine='MyISAM' partition by key (a);
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/suite/percona/percona_innodb_fake_changes.result b/mysql-test/suite/percona/percona_innodb_fake_changes.result
index f42d342aa4d..5540c76f2e5 100644
--- a/mysql-test/suite/percona/percona_innodb_fake_changes.result
+++ b/mysql-test/suite/percona/percona_innodb_fake_changes.result
@@ -34,7 +34,7 @@ SELECT * FROM t1;
 a
 1
 COMMIT;
-ERROR HY000: Got error 131 - Command not supported by database during COMMIT
+ERROR HY000: Got error 131 "Command not supported by database" during COMMIT
 SET innodb_fake_changes=default;
 DROP TABLE t1;
 # DDL must result in error
@@ -43,13 +43,13 @@ SET autocommit=0;
 SET innodb_fake_changes=1;
 BEGIN;
 CREATE TABLE t2 (a INT) ENGINE=InnoDB;
-ERROR HY000: Can't create table 'test.t2' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t2' (errno: 131 "Command not supported by database")
 DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 TRUNCATE TABLE t1;
-ERROR HY000: Got error 131 - Command not supported by database during COMMIT
+ERROR HY000: Got error 131 "Command not supported by database" during COMMIT
 ALTER TABLE t1 ENGINE=MyISAM;
-ERROR HY000: Got error 131 - Command not supported by database during COMMIT
+ERROR HY000: Got error 131 "Command not supported by database" during COMMIT
 ROLLBACK;
 SET innodb_fake_changes=default;
 DROP TABLE t1;
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index 6116e91cc43..1dbde982328 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -6,9 +6,9 @@ AND EVENT_NAME IN
 WHERE NAME LIKE "wait/synch/%")
 LIMIT 1;
 create table test.t1(a int) engine=performance_schema;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table performance_schema.t1(a int);
 ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1'
 drop table if exists test.ghost;
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index 2faabbbfda2..019d8964523 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -152,13 +152,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
@@ -250,13 +250,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_1'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
@@ -348,13 +348,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_2'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
@@ -446,13 +446,13 @@ before insert on performance_schema.file_instances
 for each row begin end;
 ERROR 42000: Access denied for user 'pfs_user_3'@'localhost' to database 'performance_schema'
 create table test.t1(a int) engine=PERFORMANCE_SCHEMA;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.setup_instruments;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.events_waits_current;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 create table test.t1 like performance_schema.file_instances;
-ERROR HY000: Can't create table 'test.t1' (errno: 131 - Command not supported by database)
+ERROR HY000: Can't create table 'test.t1' (errno: 131 "Command not supported by database")
 insert into performance_schema.setup_instruments
 set name="foo";
 ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
diff --git a/mysql-test/suite/rpl/r/rpl_EE_err.result b/mysql-test/suite/rpl/r/rpl_EE_err.result
index 6380d12a0c7..5b3f1872c4e 100644
--- a/mysql-test/suite/rpl/r/rpl_EE_err.result
+++ b/mysql-test/suite/rpl/r/rpl_EE_err.result
@@ -4,5 +4,5 @@ create table t1 (a int) engine=myisam;
 flush tables;
 drop table if exists t1;
 Warnings:
-Warning	2	Can't find file: 't1' (errno: 2 - No such file or directory)
+Warning	2	Can't find file: 't1' (errno: 2 "No such file or directory")
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
index cee83607c95..8315e0bb8f4 100644
--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -176,7 +176,7 @@ SHOW WARNINGS;
 Level	Code	Message
 SET GLOBAL debug_dbug="+d,fault_injection_registering_index";
 FLUSH LOGS;
-ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 - Operation not permitted)
+ERROR HY000: Can't open file: 'master-bin.000002' (errno: 1 "Operation not permitted")
 SET GLOBAL debug_dbug="-d,fault_injection_registering_index";
 SHOW BINARY LOGS;
 ERROR HY000: You are not using binary logging
@@ -190,7 +190,7 @@ DROP TABLE t5;
 include/rpl_restart_server.inc [server_number=1]
 SET GLOBAL debug_dbug="+d,fault_injection_openning_index";
 FLUSH LOGS;
-ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 - Operation not permitted)
+ERROR HY000: Can't open file: 'master-bin.index' (errno: 1 "Operation not permitted")
 SET GLOBAL debug_dbug="-d,fault_injection_openning_index";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
@@ -204,7 +204,7 @@ include/rpl_restart_server.inc [server_number=1]
 ###################### TEST #12
 SET GLOBAL debug_dbug="+d,fault_injection_new_file_rotate_event";
 FLUSH LOGS;
-ERROR HY000: Can't open file: 'master-bin' (errno: 2 - No such file or directory)
+ERROR HY000: Can't open file: 'master-bin' (errno: 2 "No such file or directory")
 SET GLOBAL debug_dbug="-d,fault_injection_new_file_rotate_event";
 RESET MASTER;
 ERROR HY000: Binlog closed, cannot RESET MASTER
diff --git a/mysql-test/suite/rpl/r/rpl_drop_db.result b/mysql-test/suite/rpl/r/rpl_drop_db.result
index 64311e6ff12..dda578a419e 100644
--- a/mysql-test/suite/rpl/r/rpl_drop_db.result
+++ b/mysql-test/suite/rpl/r/rpl_drop_db.result
@@ -8,12 +8,12 @@ select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
 drop database mysqltest1;
-ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17 - File exists)
+ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17 "File exists")
 use mysqltest1;
 show tables;
 Tables_in_mysqltest1
 drop database mysqltest1;
-ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17 - File exists)
+ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17 "File exists")
 use mysqltest1;
 show tables;
 Tables_in_mysqltest1