Added text for errno in error messages by:

- Adding %M my_sprintf() modifier that prints error number - system-error-text - Modified mysys, mysql_client and SQL error messages to use %M instead of %d - Added my_strerror() Updated handler errors to 5.6 error numbers Updated text for a few error messages (to match 5.6) Increased length of command name in error output extra/comp_err.c: Added support for %M include/my_base.h: Updated handler errors to 5.6 error numbers include/my_sys.h: Added my_strerror() libmysql/errmsg.c: Updated error messages to use %M mysql-test/r/errors.result: Updated result as error message have changed mysql-test/r/innodb_mysql_sync.result: Updated result with text for errno mysql-test/r/myisam-system.result: Updated result with text for errno mysql-test/r/myisam.result: Updated result as error message have changed mysql-test/r/myisampack.result: Updated result with text for errno mysql-test/r/mysql.result: Updated result with text for errno mysql-test/r/mysql_upgrade.result: Updated result with text for errno mysql-test/r/partition_datatype.result: Updated result as error message have changed mysql-test/r/partition_innodb_plugin.result: Updated result with text for errno mysql-test/r/ps_1general.result: Updated result with text for errno mysql-test/r/trigger.result: Updated result with text for errno mysql-test/r/type_bit.result: Updated result as error message have changed mysql-test/r/type_bit_innodb.result: Updated result as error message have changed mysql-test/r/type_blob.result: Updated result as error message have changed mysql-test/suite/archive/archive.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_index.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_ioerr.result: Updated result with text for errno mysql-test/suite/csv/csv.result: Updated result with text for errno mysql-test/suite/federated/federated_bug_35333.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-create-options.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-index.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-zip.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug21704.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug46000.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug53591.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb_corrupt_bit.result: New error numbers mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result: Updated result as error message have changed mysql-test/suite/innodb/t/innodb-create-options.test: Added regexp to avoid system error text mysql-test/suite/innodb/t/innodb-zip.test: Added regexp to avoid system error text mysql-test/suite/maria/maria-recovery2.result: Updated supression rule mysql-test/suite/maria/maria-recovery2.test: Updated supression rule mysql-test/suite/maria/maria.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_innodb.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_myisam.result: Updated result as error message have changed mysql-test/suite/percona/percona_innodb_fake_changes.result: Updated result with text for errno mysql-test/suite/perfschema/r/dml_cond_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_current.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history_long.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_mutex_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_performance_timers.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_rwlock_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_threads.result: Updated result as error message have changed mysql-test/suite/perfschema/r/misc.result: Updated result with text for errno mysql-test/suite/perfschema/r/privilege.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_EE_err.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_binlog_errors.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_drop_db.result: Updated result with text for errno mysys/errors.c: Updated error messages to use %M Changed all errors to use Errcode: consistenly mysys/my_handler_errors.h: Updated handler errors to 5.6 error numbers sql/share/errmsg-utf8.txt: Updated error messages to use %M sql/sys_vars.cc: Added error number to ER_EVENT_SET_VAR_ERROR strings/my_vsnprintf.c: Added %M my_sprintf() modifier that prints error number - system-error-text Simplify code Movied common code to function Removed some casts that was not necessary when reading integer/unsigned int stored in longlong Added my_strerror() unittest/mysys/my_vsnprintf-t.c: Added testing of %M
author: Michael Widenius <monty@askmonty.org> 2012-05-30 00:37:55 +0300
committer: Michael Widenius <monty@askmonty.org> 2012-05-30 00:37:55 +0300
commit: aa81e025a88d13c5040bb3fe808d70fd6d1e560c (patch)
tree: b4c742ede7e98215c740c143681d91ad53dce998
parent: 3f4ef5928e72faf2b7fd0c98c8705ac649d2faf9 (diff)
download: mariadb-git-aa81e025a88d13c5040bb3fe808d70fd6d1e560c.tar.gz
66 files changed, 1063 insertions, 891 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 1fababf3ae5..bde7d705c75 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -714,12 +714,12 @@ static ha_checksum checksum_format_specifier(const char* msg)
     }
     else if (start)
     {
-      switch(*p)
-      {
+      switch(*p) {
       case 'd':
       case 'u':
       case 'x':
       case 's':
+      case 'M':
         chksum= my_checksum(chksum, (uchar*) start, (uint) (p + 1 - start));
         start= 0; /* Not in format specifier anymore */
         break;
diff --git a/include/my_base.h b/include/my_base.h
index 4edecf63d18..dacceaa0aeb 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 
-   reserved
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+   Copyright (c) 1995, 2012 Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -456,13 +456,15 @@ enum ha_base_keytype {
 #define HA_ERR_FILE_TOO_SHORT	  175	 /* File too short */
 #define HA_ERR_WRONG_CRC	  176	 /* Wrong CRC on page */
 #define HA_ERR_TOO_MANY_CONCURRENT_TRXS 177 /*Too many active concurrent transactions */
-#define HA_ERR_INDEX_COL_TOO_LONG 178    /* Index column length exceeds limit */
-#define HA_ERR_INDEX_CORRUPT      179        /* Index corrupted */
-#define HA_ERR_UNDO_REC_TOO_BIG   180    /* Undo log record too big */
-#define HA_ERR_ROW_NOT_VISIBLE    181
-#define HA_ERR_ABORTED_BY_USER    182
-#define HA_ERR_DISK_FULL          183
-#define HA_ERR_LAST               183    /* Copy of last error nr */
+#define HA_ERR_NOT_IN_LOCK_PARTITIONS 178
+#define HA_ERR_INDEX_COL_TOO_LONG 179    /* Index column length exceeds limit */
+#define HA_ERR_INDEX_CORRUPT      180    /* Index corrupted */
+#define HA_ERR_UNDO_REC_TOO_BIG   181    /* Undo log record too big */
+#define HA_FTS_INVALID_DOCID      182	 /* Invalid InnoDB Doc ID */
+#define HA_ERR_ROW_NOT_VISIBLE    183
+#define HA_ERR_ABORTED_BY_USER    184
+#define HA_ERR_DISK_FULL          185
+#define HA_ERR_LAST               185    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_sys.h b/include/my_sys.h
index a02c390fe4b..e10cedfb654 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -52,6 +52,7 @@ typedef struct my_aio_result {
   area, and we would like to avoid unexpected truncation.
 */
 #define MYSYS_ERRMSG_SIZE   (512)
+#define MYSYS_STRERROR_SIZE (128)
 
 #define MY_FILE_ERROR	((size_t) -1)
 
@@ -627,6 +628,7 @@ extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags);
 extern FILE *my_freopen(const char *path, const char *mode, FILE *stream);
 extern int my_fclose(FILE *fd,myf MyFlags);
 extern int my_vfprintf(FILE *stream, const char* format, va_list args);
+extern void my_strerror(char *buf, size_t len, int nr);
 extern File my_fileno(FILE *fd);
 extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
 extern int my_chmod(const char *name, mode_t mode, myf my_flags);
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 498ba6e9829..4c4485f7ec4 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -27,9 +27,9 @@ const char *client_errors[]=
 {
   "Unknown MySQL error",
   "Can't create UNIX socket (%d)",
-  "Can't connect to local MySQL server through socket '%-.100s' (%d)",
-  "Can't connect to MySQL server on '%-.100s' (%d)",
-  "Can't create TCP/IP socket (%d)",
+  "Can't connect to local MySQL server through socket '%-.100s' (%M)",
+  "Can't connect to MySQL server on '%-.100s' (%M)",
+  "Can't create TCP/IP socket (%M)",
   "Unknown MySQL server host '%-.100s' (%d)",
   "MySQL server has gone away",
   "Protocol mismatch; server version = %d, client version = %d",
@@ -80,7 +80,7 @@ const char *client_errors[]=
   "Prepared statement contains no metadata",
   "Attempt to read a row while there is no result set associated with the statement",
   "This feature is not implemented yet",
-  "Lost connection to MySQL server at '%s', system error: %d",
+  "Lost connection to MySQL server at '%s', system error: %M",
   "Statement closed indirectly because of a preceeding %s() call",
   "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
   "This handle is already connected. Use a separate handle for each connection.",
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index 24ace7eb849..e6a1b492b39 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 'a' (max = 255)
+ERROR 42000: Display width out of range for column '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 58254412c5b..a4af3a2a903 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 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 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 b3ba8066f5c..78480b103d6 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)
+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/myisam.result b/mysql-test/r/myisam.result
index 64c61d4ee36..6c0826775ad 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1697,7 +1697,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65535));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 set storage_engine=MyISAM;
 set @save_concurrent_insert=@@concurrent_insert;
 set global concurrent_insert=1;
diff --git a/mysql-test/r/myisampack.result b/mysql-test/r/myisampack.result
index 56f61ccdf47..d095564d6f0 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)
+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/mysql.result b/mysql-test/r/mysql.result
index 3fb190bf963..d2e9f918d08 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -170,14 +170,14 @@ ERROR 1049 (42000) at line 1: Unknown database 'invalid'
 ERROR 1049 (42000) at line 1: Unknown database 'invalid'
 Test connect with dbname + hostname
 Test connect with dbname + _invalid_ hostname
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
 The commands reported in the bug report
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (-2)
 Too long dbname
 ERROR 1102 (42000) at line 1: Incorrect database name 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 Too long hostname
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (-2)
 1
 1
 ERROR at line 1: DELIMITER cannot contain a backslash character
@@ -206,7 +206,7 @@ COUNT (*)
 1
 COUNT (*)
 1
-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (-2)
 End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
 *************************** 1. row ***************************
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 247c2b80d62..f86541e6246 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -110,7 +110,7 @@ OK
 DROP USER mysqltest1@'%';
 Run mysql_upgrade with a non existing server socket
 Phase 1/3: Fixing table and database names
-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
+mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (-2) when trying to connect
 FATAL ERROR: Upgrade failed
 set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
 Phase 1/3: Fixing table and database names
diff --git a/mysql-test/r/partition_datatype.result b/mysql-test/r/partition_datatype.result
index e0658f71612..8d72d8781ee 100644
--- a/mysql-test/r/partition_datatype.result
+++ b/mysql-test/r/partition_datatype.result
@@ -315,11 +315,11 @@ drop table t1;
 create table t1 (a varchar(3070)) partition by key (a);
 ERROR HY000: The total length of the partitioning fields is too large
 create table t1 (a varchar(65533)) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 create table t1 (a varchar(65534) not null) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 create table t1 (a varchar(65535)) partition by key (a);
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 create table t1 (a bit(27), primary key (a)) engine=myisam
 partition by hash (a)
 (partition p0, partition p1, partition p2);
diff --git a/mysql-test/r/partition_innodb_plugin.result b/mysql-test/r/partition_innodb_plugin.result
index 21f18f715d0..a24e7c9a6fa 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 from storage engine
+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 d2f740a06f4..82f3ff7690c 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)
+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 ef998abafcf..77561250119 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)
+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 e6f4db26c23..f2f21b90e06 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 'a' (max = 64)
+ERROR 42000: Display width out of range for column '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 9bdd8658690..bd9bbc92d4b 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 'a' (max = 64)
+ERROR 42000: Display width out of range for column '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 fc2e0854620..a478af0f17d 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 'data' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
 CREATE TABLE b15776 (a text(4294967296));
-ERROR 42000: Display width out of range for 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
 CREATE TABLE b15776 (a blob(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
 CREATE TABLE b15776 (a text(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 'a' (max = 255)
+ERROR 42000: Display width out of range for column '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 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
 CREATE TABLE b15776 (a char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
 CREATE TABLE b15776 (a year(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for 'a' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '1' (max = 4294967295)
 explain select cast(1 as nchar(4294967296));
-ERROR 42000: Display width out of range for '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '1' (max = 4294967295)
 explain select cast(1 as binary(4294967296));
-ERROR 42000: Display width out of range for '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '1' (max = 4294967295)
 explain select convert(1, char(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '1' (max = 4294967295)
 explain select convert(1, nchar(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '1' (max = 4294967295)
 explain select convert(1, binary(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999));
-ERROR 42000: Display width out of range for '1' (max = 4294967295)
+ERROR 42000: Display width out of range for column '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 b4c4aab621d..f6978fe9685 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)
+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 ca92cc5398b..b92a3540cf2 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)
+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)
+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 9dd927b9299..3577b6a0a74 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)
+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)
+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 6b20add1bed..6c029ae2f46 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)
+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)
+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)
+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/federated/federated_bug_35333.result b/mysql-test/suite/federated/federated_bug_35333.result
index e1319cfeeae..79ee497b926 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)
+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)
+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)
+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..7417bb2478b 100644
--- a/mysql-test/suite/innodb/r/innodb-create-options.result
+++ b/mysql-test/suite/innodb/r/innodb-create-options.result
@@ -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	
@@ -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
@@ -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
@@ -352,11 +352,11 @@ Level	Code	Message
 Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
 Error	1005	Can't create table 'test.t1' (errno: 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 48390b14a82..1b0c278a8ad 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)
+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)
+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)
+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)
+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)
+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)
+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 94f3bc71af1..d71ae30eaed 100644
--- a/mysql-test/suite/innodb/r/innodb-zip.result
+++ b/mysql-test/suite/innodb/r/innodb-zip.result
@@ -126,12 +126,12 @@ CREATE TABLE t1(
 c TEXT NOT NULL, d TEXT NOT NULL,
 PRIMARY KEY (c(767),d(767)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 CREATE TABLE t1(
 c TEXT NOT NULL, d TEXT NOT NULL,
 PRIMARY KEY (c(767),d(767)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 CHARSET=ASCII;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 CREATE TABLE t1(
 c TEXT NOT NULL, d TEXT NOT NULL,
 PRIMARY KEY (c(767),d(767)))
@@ -139,7 +139,7 @@ ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
 drop table t1;
 CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
 ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
 INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index bb4d783ccf4..f5e55dca1b8 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)
+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)
+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)
+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)
+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)
@@ -3024,7 +3024,7 @@ c21 CHAR(255), c22 CHAR(255), c23 CHAR(255), c24 CHAR(255),
 c25 CHAR(255), c26 CHAR(255), c27 CHAR(255), c28 CHAR(255),
 c29 CHAR(255), c30 CHAR(255), c31 CHAR(255), c32 CHAR(255)
 ) ENGINE = InnoDB;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 DROP TABLE IF EXISTS t1;
 Warnings:
 Note	1051	Unknown table 't1'
diff --git a/mysql-test/suite/innodb/r/innodb_bug21704.result b/mysql-test/suite/innodb/r/innodb_bug21704.result
index ffbfa8a337e..f7800acbff8 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)
+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)
+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)
+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)
+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 b27b3d7443b..5b407fca427 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)
+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/innodb/r/innodb_bug53591.result b/mysql-test/suite/innodb/r/innodb_bug53591.result
index cf226464a4b..993497e0579 100644
--- a/mysql-test/suite/innodb/r/innodb_bug53591.result
+++ b/mysql-test/suite/innodb/r/innodb_bug53591.result
@@ -8,7 +8,7 @@ ERROR HY000: Too big row
 SHOW WARNINGS;
 Level	Code	Message
 Error	139	Too big row
-Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+Error	1118	Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 DROP TABLE bug53591;
 SET GLOBAL innodb_file_format=Antelope;
 SET GLOBAL innodb_file_per_table=0;
diff --git a/mysql-test/suite/innodb/r/innodb_corrupt_bit.result b/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
index 13b1e24a9ed..e194f67f5c5 100644
--- a/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
+++ b/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
@@ -45,8 +45,8 @@ select z from corrupt_bit_test_ā;
 ERROR HY000: Index corrupt_bit_test_ā is corrupted
 show warnings;
 Level	Code	Message
-Warning	179	InnoDB: Index "idxē" for table "test"."corrupt_bit_test_ā" is marked as corrupted
-Warning	179	Got error 179 when reading table `test`.`corrupt_bit_test_ā`
+Warning	180	InnoDB: Index "idxē" for table "test"."corrupt_bit_test_ā" is marked as corrupted
+Warning	180	Got error 180 when reading table `test`.`corrupt_bit_test_ā`
 Error	1712	Index corrupt_bit_test_ā is corrupted
 insert into corrupt_bit_test_ā values (10001, "a", 20001, 20001);
 select * from corrupt_bit_test_ā use index(primary) where a = 10001;
diff --git a/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result b/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
index 3ab3b28d6b5..507d8e66117 100644
--- a/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
+++ b/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
@@ -649,7 +649,7 @@ CREATE TABLE worklog5743 (col_1_varchar VARCHAR (4000) CHARACTER SET 'utf8',
 col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8' ,
 PRIMARY KEY (col_1_varchar(1024))
 ) ROW_FORMAT=DYNAMIC, engine = innodb;
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 8126. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 CREATE TABLE worklog5743 (
 col_1_varbinary VARBINARY (4000) ,
 col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8',
diff --git a/mysql-test/suite/innodb/t/innodb-create-options.test b/mysql-test/suite/innodb/t/innodb-create-options.test
index 3215002a37c..bbf8ab23b03 100644
--- a/mysql-test/suite/innodb/t/innodb-create-options.test
+++ b/mysql-test/suite/innodb/t/innodb-create-options.test
@@ -76,8 +76,10 @@ SET SESSION innodb_strict_mode = ON;
 DROP TABLE IF EXISTS t1;
 --echo #         'FIXED' is sent to InnoDB since it is used by MyISAM.
 --echo #         But it is an invalid mode in InnoDB
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
 SHOW WARNINGS;
@@ -106,14 +108,20 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 --echo # Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
 --echo #         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
 DROP TABLE IF EXISTS t1;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 SHOW WARNINGS;
@@ -232,8 +240,10 @@ SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE
 
 --echo # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
 DROP TABLE IF EXISTS t1;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
 
 --echo # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
@@ -241,14 +251,20 @@ SHOW WARNINGS;
 --echo #         and that they can be set to default values during strict mode.
 SET GLOBAL innodb_file_format=Antelope;
 DROP TABLE IF EXISTS t1;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
 SHOW WARNINGS;
@@ -296,11 +312,15 @@ SET GLOBAL innodb_file_format=Barracuda;
 --echo #         values during strict mode.
 SET GLOBAL innodb_file_per_table=OFF;
 DROP TABLE IF EXISTS t1;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+--replace_regex / - .*[0-9]*)/)/
 SHOW WARNINGS;
 --error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb/t/innodb-zip.test
index 39a094d0359..e0ddfab38b0 100644
--- a/mysql-test/suite/innodb/t/innodb-zip.test
+++ b/mysql-test/suite/innodb/t/innodb-zip.test
@@ -177,8 +177,10 @@ set innodb_strict_mode = on;
 
 create table t1 (id int primary key) engine = innodb key_block_size = 0;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb key_block_size = 9;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
 
@@ -202,19 +204,25 @@ drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11;
 create table t1 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compressed;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb
 key_block_size = 8 row_format = redundant;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t3 (id int primary key) engine = innodb
 key_block_size = 8 row_format = compact;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t4 (id int primary key) engine = innodb
 key_block_size = 8 row_format = dynamic;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
 create table t5 (id int primary key) engine = innodb
@@ -225,19 +233,25 @@ FROM information_schema.tables WHERE engine='innodb';
 drop table t1, t5;
 
 #test multiple errors
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t1 (id int primary key) engine = innodb
 key_block_size = 9 row_format = redundant;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = compact;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb
 key_block_size = 9 row_format = dynamic;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 
 SELECT table_schema, table_name, row_format, data_length, index_length
@@ -246,26 +260,40 @@ FROM information_schema.tables WHERE engine='innodb';
 #test valid values with innodb_file_per_table unset
 set global innodb_file_per_table = off;
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t6 (id int primary key) engine = innodb row_format = compressed;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
@@ -278,26 +306,40 @@ drop table t8, t9;
 set global innodb_file_per_table = on;
 set global innodb_file_format = `0`; 
 
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t1 (id int primary key) engine = innodb key_block_size = 1;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t2 (id int primary key) engine = innodb key_block_size = 2;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t3 (id int primary key) engine = innodb key_block_size = 4;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t4 (id int primary key) engine = innodb key_block_size = 8;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t5 (id int primary key) engine = innodb key_block_size = 16;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t6 (id int primary key) engine = innodb row_format = compressed;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
+--replace_regex / - .*[0-9]*)/)/
 --error ER_CANT_CREATE_TABLE
 create table t7 (id int primary key) engine = innodb row_format = dynamic;
+--replace_regex / - .*[0-9]*)/)/
 show warnings;
 create table t8 (id int primary key) engine = innodb row_format = compact;
 create table t9 (id int primary key) engine = innodb row_format = redundant;
diff --git a/mysql-test/suite/maria/maria-recovery2.result b/mysql-test/suite/maria/maria-recovery2.result
index 149ce5a01af..6e4daa64615 100644
--- a/mysql-test/suite/maria/maria-recovery2.result
+++ b/mysql-test/suite/maria/maria-recovery2.result
@@ -1,4 +1,4 @@
-call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2 .*\\)");
 call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
 set global aria_log_file_size=4294959104;
 drop database if exists mysqltest;
diff --git a/mysql-test/suite/maria/maria-recovery2.test b/mysql-test/suite/maria/maria-recovery2.test
index 8d27d9aaaac..3c0ad75f8a8 100644
--- a/mysql-test/suite/maria/maria-recovery2.test
+++ b/mysql-test/suite/maria/maria-recovery2.test
@@ -5,7 +5,7 @@
 --source include/have_debug.inc
 --source include/have_maria.inc
 
-call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2\\)");
+call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2 .*\\)");
 call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
 
 set global aria_log_file_size=4294959104;
diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index 888c1c10c5e..6efd87df786 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -1586,7 +1586,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(65535));
-ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. You have to change some columns to TEXT or BLOBs
+ERROR 42000: Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs
 set @save_concurrent_insert=@@concurrent_insert;
 set global concurrent_insert=1;
 create table t1 (a int) ROW_FORMAT=FIXED;
diff --git a/mysql-test/suite/parts/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result
index 2e802d85b1f..a9ae917f13d 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 'a' (max = 64)
+ERROR 42000: Display width out of range for column '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 c396cf66521..680845c9971 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 'a' (max = 64)
+ERROR 42000: Display width out of range for column '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 7f00c687c54..f42d342aa4d 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 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)
+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 during COMMIT
+ERROR HY000: Got error 131 - Command not supported by database during COMMIT
 ALTER TABLE t1 ENGINE=MyISAM;
-ERROR HY000: Got error 131 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/dml_cond_instances.result b/mysql-test/suite/perfschema/r/dml_cond_instances.result
index 285c32090af..5cd04127700 100644
--- a/mysql-test/suite/perfschema/r/dml_cond_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -13,8 +13,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_in
 delete from performance_schema.cond_instances;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
 LOCK TABLES performance_schema.cond_instances READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.cond_instances WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_current.result b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
index 122cfcce4a1..66ff929e79b 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
@@ -18,8 +18,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_current;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
 LOCK TABLES performance_schema.events_waits_current READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_current WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history.result b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
index 199ccc1cfa5..ba883c9552a 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
@@ -22,8 +22,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_history;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
 LOCK TABLES performance_schema.events_waits_history READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_history WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
index 773dcd3b1dc..408368ca77c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
@@ -22,8 +22,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_history_long;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
 LOCK TABLES performance_schema.events_waits_history_long READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_history_long WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
index 6ba37025d3b..0c95c61fd08 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
@@ -27,8 +27,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_summary_by_instance;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
 LOCK TABLES performance_schema.events_waits_summary_by_instance READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
index a98acb5f536..27f8b5644fd 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
@@ -19,8 +19,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_summary_by_thread_by_event_name;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
 LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
index 159adbd8022..6ddf1841a4e 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
@@ -18,8 +18,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_
 delete from performance_schema.events_waits_summary_global_by_event_name;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
 LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
index 4a8a7ac4d47..52204160a4b 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -13,8 +13,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_in
 delete from performance_schema.file_instances;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
 LOCK TABLES performance_schema.file_instances READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_instances WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
index a8a9fe852bb..be1b744f786 100644
--- a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
@@ -18,8 +18,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_su
 delete from performance_schema.file_summary_by_event_name;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
 LOCK TABLES performance_schema.file_summary_by_event_name READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_summary_by_event_name WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
index 456d6e31173..eabd9170cbc 100644
--- a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
@@ -18,8 +18,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_su
 delete from performance_schema.file_summary_by_instance;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
 LOCK TABLES performance_schema.file_summary_by_instance READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_summary_by_instance WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mutex_instances.result b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
index 665517c7227..0089e20b3b6 100644
--- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
@@ -13,8 +13,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_i
 delete from performance_schema.mutex_instances;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
 LOCK TABLES performance_schema.mutex_instances READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.mutex_instances WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_performance_timers.result b/mysql-test/suite/perfschema/r/dml_performance_timers.result
index f345cce921e..99d0b9fdf60 100644
--- a/mysql-test/suite/perfschema/r/dml_performance_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_performance_timers.result
@@ -22,8 +22,8 @@ delete from performance_schema.performance_timers
 where timer_name='CYCLE';
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
 LOCK TABLES performance_schema.performance_timers READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.performance_timers WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
index b072eea3955..117c4e47508 100644
--- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
@@ -13,8 +13,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_
 delete from performance_schema.rwlock_instances;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
 LOCK TABLES performance_schema.rwlock_instances READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.rwlock_instances WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result
index b78d1934d1f..c5a753e7f14 100644
--- a/mysql-test/suite/perfschema/r/dml_threads.result
+++ b/mysql-test/suite/perfschema/r/dml_threads.result
@@ -17,8 +17,8 @@ ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads
 delete from performance_schema.threads;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
 LOCK TABLES performance_schema.threads READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'threads'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.threads WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'threads'
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index 2f66f80ed75..6116e91cc43 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)
+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)
+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 d1831c9c4be..2faabbbfda2 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)
+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)
+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)
+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)
+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'
@@ -179,16 +179,16 @@ unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -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)
+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)
+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)
+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)
+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'
@@ -277,16 +277,16 @@ unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -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)
+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)
+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)
+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)
+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'
@@ -375,16 +375,16 @@ unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -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)
+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)
+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)
+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)
+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'
@@ -473,16 +473,16 @@ unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT,LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
diff --git a/mysql-test/suite/rpl/r/rpl_EE_err.result b/mysql-test/suite/rpl/r/rpl_EE_err.result
index 8220f4e0c8d..6380d12a0c7 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)
+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 ddafbca0672..cee83607c95 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)
+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)
+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)
+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 8a88f01a444..64311e6ff12 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)
+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)
+ERROR HY000: Error dropping database (can't rmdir './mysqltest1/', errno: 17 - File exists)
 use mysqltest1;
 show tables;
 Tables_in_mysqltest1
diff --git a/mysys/errors.c b/mysys/errors.c
index bf7299ce4c6..6cc0f083922 100644
--- a/mysys/errors.c
+++ b/mysys/errors.c
@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2000, 2010, Oracle and/or its affiliates
+   Copyright (c) 1995, 2012 Monty Program Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,41 +22,41 @@
 
 const char *globerrs[GLOBERRS]=
 {
-  "Can't create/write to file '%s' (Errcode: %d)",
-  "Error reading file '%s' (Errcode: %d)",
-  "Error writing file '%s' (Errcode: %d)",
-  "Error on close of '%s' (Errcode: %d)",
+  "Can't create/write to file '%s' (Errcode: %M)",
+  "Error reading file '%s' (Errcode: %M)",
+  "Error writing file '%s' (Errcode: %M)",
+  "Error on close of '%s' (Errcode: %M)",
   "Out of memory (Needed %u bytes)",
-  "Error on delete of '%s' (Errcode: %d)",
-  "Error on rename of '%s' to '%s' (Errcode: %d)",
+  "Error on delete of '%s' (Errcode: %M)",
+  "Error on rename of '%s' to '%s' (Errcode: %M)",
   "",
-  "Unexpected eof found when reading file '%s' (Errcode: %d)",
-  "Can't lock file (Errcode: %d)",
-  "Can't unlock file (Errcode: %d)",
-  "Can't read dir of '%s' (Errcode: %d)",
-  "Can't get stat of '%s' (Errcode: %d)",
-  "Can't change size of file (Errcode: %d)",
-  "Can't open stream from handle (Errcode: %d)",
-  "Can't get working dirctory (Errcode: %d)",
-  "Can't change dir to '%s' (Errcode: %d)",
+  "Unexpected end-of-file found when reading file '%s' (Errcode: %M)",
+  "Can't lock file (Errcode: %M)",
+  "Can't unlock file (Errcode: %M)",
+  "Can't read dir of '%s' (Errcode: %M)",
+  "Can't get stat of '%s' (Errcode: %M)",
+  "Can't change size of file (Errcode: %M)",
+  "Can't open stream from handle (Errcode: %M)",
+  "Can't get working directory (Errcode: %M)",
+  "Can't change dir to '%s' (Errcode: %M)",
   "Warning: '%s' had %d links",
   "Warning: %d files and %d streams is left open\n",
-  "Disk is full writing '%s' (Errcode: %d). Waiting for someone to free space... (Expect up to %d secs delay for server to continue after freeing disk space)",
-  "Can't create directory '%s' (Errcode: %d)",
+  "Disk is full writing '%s' (Errcode: %M). Waiting for someone to free space... (Expect up to %d secs delay for server to continue after freeing disk space)",
+  "Can't create directory '%s' (Errcode: %M)",
   "Character set '%s' is not a compiled character set and is not specified in the '%s' file",
-  "Out of resources when opening file '%s' (Errcode: %d)",
-  "Can't read value for symlink '%s' (Error %d)",
-  "Can't create symlink '%s' pointing at '%s' (Error %d)",
-  "Error on realpath() on '%s' (Error %d)",
-  "Can't sync file '%s' to disk (Errcode: %d)",
+  "Out of resources when opening file '%s' (Errcode: %M)",
+  "Can't read value for symlink '%s' (Errcode: %M)",
+  "Can't create symlink '%s' pointing at '%s' (Errcode: %M)",
+  "Error on realpath() on '%s' (Errcode: %M)",
+  "Can't sync file '%s' to disk (Errcode: %M)",
   "Collation '%s' is not a compiled collation and is not specified in the '%s' file",
-  "File '%s' not found (Errcode: %d)",
+  "File '%s' not found (Errcode: %M)",
   "File '%s' (fileno: %d) was not closed",
-  "Can't change ownership of the file '%s' (Errcode: %d)",
-  "Can't change permissions of the file '%s' (Errcode: %d)",
-  "Can't seek in file '%s' (Errcode: %d)"
-  "Can't change mode for file '%s' to 0x%lx (Error: %d)",
-  "Warning: Can't copy ownership for file '%s' (Error: %d)"
+  "Can't change ownership of the file '%s' (Errcode: %M)",
+  "Can't change permissions of the file '%s' (Errcode: %M)",
+  "Can't seek in file '%s' (Errcode: %M)"
+  "Can't change mode for file '%s' to 0x%lx (Errcode: %M)",
+  "Warning: Can't copy ownership for file '%s' (Errcode: %M)"
 };
 
 void init_glob_errs(void)
@@ -67,40 +68,40 @@ void init_glob_errs(void)
 
 void init_glob_errs()
 {
-  EE(EE_CANTCREATEFILE) = "Can't create/write to file '%s' (Errcode: %d)";
-  EE(EE_READ)		= "Error reading file '%s' (Errcode: %d)";
-  EE(EE_WRITE)		= "Error writing file '%s' (Errcode: %d)";
-  EE(EE_BADCLOSE)	= "Error on close of '%'s (Errcode: %d)";
+  EE(EE_CANTCREATEFILE) = "Can't create/write to file '%s' (Errcode: %M)";
+  EE(EE_READ)		= "Error reading file '%s' (Errcode: %M)";
+  EE(EE_WRITE)		= "Error writing file '%s' (Errcode: %M)";
+  EE(EE_BADCLOSE)	= "Error on close of '%'s (Errcode: %M)";
   EE(EE_OUTOFMEMORY)	= "Out of memory (Needed %u bytes)";
-  EE(EE_DELETE)		= "Error on delete of '%s' (Errcode: %d)";
-  EE(EE_LINK)		= "Error on rename of '%s' to '%s' (Errcode: %d)";
-  EE(EE_EOFERR)		= "Unexpected eof found when reading file '%s' (Errcode: %d)";
-  EE(EE_CANTLOCK)	= "Can't lock file (Errcode: %d)";
-  EE(EE_CANTUNLOCK)	= "Can't unlock file (Errcode: %d)";
-  EE(EE_DIR)		= "Can't read dir of '%s' (Errcode: %d)";
-  EE(EE_STAT)		= "Can't get stat of '%s' (Errcode: %d)";
-  EE(EE_CANT_CHSIZE)	= "Can't change size of file (Errcode: %d)";
-  EE(EE_CANT_OPEN_STREAM)= "Can't open stream from handle (Errcode: %d)";
-  EE(EE_GETWD)		= "Can't get working directory (Errcode: %d)";
-  EE(EE_SETWD)		= "Can't change dir to '%s' (Errcode: %d)";
+  EE(EE_DELETE)		= "Error on delete of '%s' (Errcode: %M)";
+  EE(EE_LINK)		= "Error on rename of '%s' to '%s' (Errcode: %M)";
+  EE(EE_EOFERR)		= "Unexpected eof found when reading file '%s' (Errcode: %M)";
+  EE(EE_CANTLOCK)	= "Can't lock file (Errcode: %M)";
+  EE(EE_CANTUNLOCK)	= "Can't unlock file (Errcode: %M)";
+  EE(EE_DIR)		= "Can't read dir of '%s' (Errcode: %M)";
+  EE(EE_STAT)		= "Can't get stat of '%s' (Errcode: %M)";
+  EE(EE_CANT_CHSIZE)	= "Can't change size of file (Errcode: %M)";
+  EE(EE_CANT_OPEN_STREAM)= "Can't open stream from handle (Errcode: %M)";
+  EE(EE_GETWD)		= "Can't get working directory (Errcode: %M)";
+  EE(EE_SETWD)		= "Can't change dir to '%s' (Errcode: %M)";
   EE(EE_LINK_WARNING)	= "Warning: '%s' had %d links";
   EE(EE_OPEN_WARNING)	= "Warning: %d files and %d streams is left open\n";
-  EE(EE_DISK_FULL)	= "Disk is full writing '%s'. Waiting for someone to free space...";
-  EE(EE_CANT_MKDIR)	="Can't create directory '%s' (Errcode: %d)";
+  EE(EE_DISK_FULL)	= "Disk is full writing '%s' (Errcode: %M). Waiting for someone to free space... (Expect up to %d secs delay for server to continue after freeing disk space)",
+  EE(EE_CANT_MKDIR)	="Can't create directory '%s' (Errcode: %M)";
   EE(EE_UNKNOWN_CHARSET)= "Character set '%s' is not a compiled character set and is not specified in the %s file";
-  EE(EE_OUT_OF_FILERESOURCES)="Out of resources when opening file '%s' (Errcode: %d)";
-  EE(EE_CANT_READLINK)=	"Can't read value for symlink '%s' (Error %d)";
-  EE(EE_CANT_SYMLINK)=	"Can't create symlink '%s' pointing at '%s' (Error %d)";
-  EE(EE_REALPATH)=	"Error on realpath() on '%s' (Error %d)";
-  EE(EE_SYNC)=		"Can't sync file '%s' to disk (Errcode: %d)";
+  EE(EE_OUT_OF_FILERESOURCES)="Out of resources when opening file '%s' (Errcode: %M)";
+  EE(EE_CANT_READLINK)=	"Can't read value for symlink '%s' (Errcode: %M)";
+  EE(EE_CANT_SYMLINK)=	"Can't create symlink '%s' pointing at '%s' (Errcode: %M)";
+  EE(EE_REALPATH)=	"Error on realpath() on '%s' (Errcode: %M)";
+  EE(EE_SYNC)=		"Can't sync file '%s' to disk (Errcode: %M)";
   EE(EE_UNKNOWN_COLLATION)= "Collation '%s' is not a compiled collation and is not specified in the %s file";
-  EE(EE_FILENOTFOUND)	= "File '%s' not found (Errcode: %d)";
+  EE(EE_FILENOTFOUND)	= "File '%s' not found (Errcode: %M)";
   EE(EE_FILE_NOT_CLOSED) = "File '%s' (fileno: %d) was not closed";
-  EE(EE_CHANGE_OWNERSHIP)   = "Can't change ownership of the file '%s' (Errcode: %d)";
-  EE(EE_CHANGE_PERMISSIONS) = "Can't change permissions of the file '%s' (Errcode: %d)";
-  EE(EE_CANT_SEEK)      = "Can't seek in file '%s' (Errcode: %d)";
-  EE(EE_CANT_CHMOD)    = "Can't change mode for file '%s' to 0x%lx (Error: %d)";
-  EE(EE_CANT_COPY_OWNERSHIP)= "Warning: Can't copy ownership for file '%s' (Error: %d)";
+  EE(EE_CHANGE_OWNERSHIP)   = "Can't change ownership of the file '%s' (Errcode: %M)";
+  EE(EE_CHANGE_PERMISSIONS) = "Can't change permissions of the file '%s' (Errcode: %M)";
+  EE(EE_CANT_SEEK)      = "Can't seek in file '%s' (Errcode: %M)";
+  EE(EE_CANT_CHMOD)    = "Can't change mode for file '%s' to 0x%lx (Errcode: %M)";
+  EE(EE_CANT_COPY_OWNERSHIP)= "Warning: Can't copy ownership for file '%s' (Errcode: %M)";
 }
 #endif
 
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
index 551077a81ee..8e6c17cde92 100644
--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@@ -81,9 +81,11 @@ static const char *handler_error_messages[]=
   "File too short; Expected more data in file",
   "Read page with wrong checksum",
   "Too many active concurrent transactions",
+  "Record not matching the given partition set",
   "Index column length exceeds limit",
   "Index corrupted",
   "Undo record too big",
+  "Invalid InnoDB FTS Doc ID",
   "Row is not visible by the current transaction",
   "Operation was interrupted by end user (probably kill command?)",
   "Disk full"
diff --git a/sql-common/client.c b/sql-common/client.c
index 349d844ebd3..337e5b7458c 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3196,7 +3196,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       */
       DBUG_PRINT("info",("IPV6 getaddrinfo error %d", gai_errno));
       set_mysql_extended_error(mysql, CR_UNKNOWN_HOST, unknown_sqlstate,
-                               ER(CR_UNKNOWN_HOST), host, errno);
+                               ER(CR_UNKNOWN_HOST), host, gai_errno);
 
       goto error;
     }
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 8510eb1f1ac..ebb7d446a6c 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -51,79 +51,79 @@ ER_YES
         spa "SI"
         ukr "ТАК"
 ER_CANT_CREATE_FILE  
-        cze "Nemohu vytvo-Břit soubor '%-.200s' (chybový kód: %d)"
-        dan "Kan ikke oprette filen '%-.200s' (Fejlkode: %d)"
-        nla "Kan file '%-.200s' niet aanmaken (Errcode: %d)"
-        eng "Can't create file '%-.200s' (errno: %d)"
-        est "Ei suuda luua faili '%-.200s' (veakood: %d)"
-        fre "Ne peut créer le fichier '%-.200s' (Errcode: %d)"
-        ger "Kann Datei '%-.200s' nicht erzeugen (Fehler: %d)"
-        greek "Αδύνατη η δημιουργία του αρχείου '%-.200s' (κωδικός λάθους: %d)"
-        hun "A '%-.200s' file nem hozhato letre (hibakod: %d)"
-        ita "Impossibile creare il file '%-.200s' (errno: %d)"
-        jpn "'%-.200s' ファイルが作れません (errno: %d)"
-        kor "화일 '%-.200s'를 만들지 못했습니다. (에러번호: %d)"
-        nor "Kan ikke opprette fila '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje opprette fila '%-.200s' (Feilkode: %d)"
-        pol "Nie można stworzyć pliku '%-.200s' (Kod błędu: %d)"
-        por "Não pode criar o arquivo '%-.200s' (erro no. %d)"
-        rum "Nu pot sa creez fisierul '%-.200s' (Eroare: %d)"
-        rus "Невозможно создать файл '%-.200s' (ошибка: %d)"
-        serbian "Ne mogu da kreiram file '%-.200s' (errno: %d)"
-        slo "Nemôžem vytvoriť súbor '%-.200s' (chybový kód: %d)"
-        spa "No puedo crear archivo '%-.200s' (Error: %d)"
-        swe "Kan inte skapa filen '%-.200s' (Felkod: %d)"
-        ukr "Не можу створити файл '%-.200s' (помилка: %d)"
+        cze "Nemohu vytvo-Břit soubor '%-.200s' (chybový kód: %M)"
+        dan "Kan ikke oprette filen '%-.200s' (Fejlkode: %M)"
+        nla "Kan file '%-.200s' niet aanmaken (Errcode: %M)"
+        eng "Can't create file '%-.200s' (errno: %M)"
+        est "Ei suuda luua faili '%-.200s' (veakood: %M)"
+        fre "Ne peut créer le fichier '%-.200s' (Errcode: %M)"
+        ger "Kann Datei '%-.200s' nicht erzeugen (Fehler: %M)"
+        greek "Αδύνατη η δημιουργία του αρχείου '%-.200s' (κωδικός λάθους: %M)"
+        hun "A '%-.200s' file nem hozhato letre (hibakod: %M)"
+        ita "Impossibile creare il file '%-.200s' (errno: %M)"
+        jpn "'%-.200s' ファイルが作れません (errno: %M)"
+        kor "화일 '%-.200s'를 만들지 못했습니다. (에러번호: %M)"
+        nor "Kan ikke opprette fila '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje opprette fila '%-.200s' (Feilkode: %M)"
+        pol "Nie można stworzyć pliku '%-.200s' (Kod błędu: %M)"
+        por "Não pode criar o arquivo '%-.200s' (erro no. %M)"
+        rum "Nu pot sa creez fisierul '%-.200s' (Eroare: %M)"
+        rus "Невозможно создать файл '%-.200s' (ошибка: %M)"
+        serbian "Ne mogu da kreiram file '%-.200s' (errno: %M)"
+        slo "Nemôžem vytvoriť súbor '%-.200s' (chybový kód: %M)"
+        spa "No puedo crear archivo '%-.200s' (Error: %M)"
+        swe "Kan inte skapa filen '%-.200s' (Felkod: %M)"
+        ukr "Не можу створити файл '%-.200s' (помилка: %M)"
 ER_CANT_CREATE_TABLE  
-        cze "Nemohu vytvo-Břit tabulku '%-.200s' (chybový kód: %d)"
-        dan "Kan ikke oprette tabellen '%-.200s' (Fejlkode: %d)"
-        nla "Kan tabel '%-.200s' niet aanmaken (Errcode: %d)"
-        eng "Can't create table '%-.200s' (errno: %d)"
-        jps "'%-.200s' テーブルが作れません.(errno: %d)",
-        est "Ei suuda luua tabelit '%-.200s' (veakood: %d)"
-        fre "Ne peut créer la table '%-.200s' (Errcode: %d)"
-        ger "Kann Tabelle '%-.200s' nicht erzeugen (Fehler: %d)"
-        greek "Αδύνατη η δημιουργία του πίνακα '%-.200s' (κωδικός λάθους: %d)"
-        hun "A '%-.200s' tabla nem hozhato letre (hibakod: %d)"
-        ita "Impossibile creare la tabella '%-.200s' (errno: %d)"
-        jpn "'%-.200s' テーブルが作れません.(errno: %d)"
-        kor "테이블 '%-.200s'를 만들지 못했습니다. (에러번호: %d)"
-        nor "Kan ikke opprette tabellen '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje opprette tabellen '%-.200s' (Feilkode: %d)"
-        pol "Nie można stworzyć tabeli '%-.200s' (Kod błędu: %d)"
-        por "Não pode criar a tabela '%-.200s' (erro no. %d)"
-        rum "Nu pot sa creez tabla '%-.200s' (Eroare: %d)"
-        rus "Невозможно создать таблицу '%-.200s' (ошибка: %d)"
-        serbian "Ne mogu da kreiram tabelu '%-.200s' (errno: %d)"
-        slo "Nemôžem vytvoriť tabuľku '%-.200s' (chybový kód: %d)"
-        spa "No puedo crear tabla '%-.200s' (Error: %d)"
-        swe "Kan inte skapa tabellen '%-.200s' (Felkod: %d)"
-        ukr "Не можу створити таблицю '%-.200s' (помилка: %d)"
+        cze "Nemohu vytvo-Břit tabulku '%-.200s' (chybový kód: %M)"
+        dan "Kan ikke oprette tabellen '%-.200s' (Fejlkode: %M)"
+        nla "Kan tabel '%-.200s' niet aanmaken (Errcode: %M)"
+        eng "Can't create table '%-.200s' (errno: %M)"
+        jps "'%-.200s' テーブルが作れません.(errno: %M)",
+        est "Ei suuda luua tabelit '%-.200s' (veakood: %M)"
+        fre "Ne peut créer la table '%-.200s' (Errcode: %M)"
+        ger "Kann Tabelle '%-.200s' nicht erzeugen (Fehler: %M)"
+        greek "Αδύνατη η δημιουργία του πίνακα '%-.200s' (κωδικός λάθους: %M)"
+        hun "A '%-.200s' tabla nem hozhato letre (hibakod: %M)"
+        ita "Impossibile creare la tabella '%-.200s' (errno: %M)"
+        jpn "'%-.200s' テーブルが作れません.(errno: %M)"
+        kor "테이블 '%-.200s'를 만들지 못했습니다. (에러번호: %M)"
+        nor "Kan ikke opprette tabellen '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje opprette tabellen '%-.200s' (Feilkode: %M)"
+        pol "Nie można stworzyć tabeli '%-.200s' (Kod błędu: %M)"
+        por "Não pode criar a tabela '%-.200s' (erro no. %M)"
+        rum "Nu pot sa creez tabla '%-.200s' (Eroare: %M)"
+        rus "Невозможно создать таблицу '%-.200s' (ошибка: %M)"
+        serbian "Ne mogu da kreiram tabelu '%-.200s' (errno: %M)"
+        slo "Nemôžem vytvoriť tabuľku '%-.200s' (chybový kód: %M)"
+        spa "No puedo crear tabla '%-.200s' (Error: %M)"
+        swe "Kan inte skapa tabellen '%-.200s' (Felkod: %M)"
+        ukr "Не можу створити таблицю '%-.200s' (помилка: %M)"
 ER_CANT_CREATE_DB  
-        cze "Nemohu vytvo-Břit databázi '%-.192s' (chybový kód: %d)"
-        dan "Kan ikke oprette databasen '%-.192s' (Fejlkode: %d)"
-        nla "Kan database '%-.192s' niet aanmaken (Errcode: %d)"
-        eng "Can't create database '%-.192s' (errno: %d)"
-        jps "'%-.192s' データベースが作れません (errno: %d)",
-        est "Ei suuda luua andmebaasi '%-.192s' (veakood: %d)"
-        fre "Ne peut créer la base '%-.192s' (Erreur %d)"
-        ger "Kann Datenbank '%-.192s' nicht erzeugen (Fehler: %d)"
-        greek "Αδύνατη η δημιουργία της βάσης δεδομένων '%-.192s' (κωδικός λάθους: %d)"
-        hun "Az '%-.192s' adatbazis nem hozhato letre (hibakod: %d)"
-        ita "Impossibile creare il database '%-.192s' (errno: %d)"
-        jpn "'%-.192s' データベースが作れません (errno: %d)"
-        kor "데이타베이스 '%-.192s'를 만들지 못했습니다.. (에러번호: %d)"
-        nor "Kan ikke opprette databasen '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje opprette databasen '%-.192s' (Feilkode: %d)"
-        pol "Nie można stworzyć bazy danych '%-.192s' (Kod błędu: %d)"
-        por "Não pode criar o banco de dados '%-.192s' (erro no. %d)"
-        rum "Nu pot sa creez baza de date '%-.192s' (Eroare: %d)"
-        rus "Невозможно создать базу данных '%-.192s' (ошибка: %d)"
-        serbian "Ne mogu da kreiram bazu '%-.192s' (errno: %d)"
-        slo "Nemôžem vytvoriť databázu '%-.192s' (chybový kód: %d)"
-        spa "No puedo crear base de datos '%-.192s' (Error: %d)"
-        swe "Kan inte skapa databasen '%-.192s' (Felkod: %d)"
-        ukr "Не можу створити базу данних '%-.192s' (помилка: %d)"
+        cze "Nemohu vytvo-Břit databázi '%-.192s' (chybový kód: %M)"
+        dan "Kan ikke oprette databasen '%-.192s' (Fejlkode: %M)"
+        nla "Kan database '%-.192s' niet aanmaken (Errcode: %M)"
+        eng "Can't create database '%-.192s' (errno: %M)"
+        jps "'%-.192s' データベースが作れません (errno: %M)",
+        est "Ei suuda luua andmebaasi '%-.192s' (veakood: %M)"
+        fre "Ne peut créer la base '%-.192s' (Erreur %M)"
+        ger "Kann Datenbank '%-.192s' nicht erzeugen (Fehler: %M)"
+        greek "Αδύνατη η δημιουργία της βάσης δεδομένων '%-.192s' (κωδικός λάθους: %M)"
+        hun "Az '%-.192s' adatbazis nem hozhato letre (hibakod: %M)"
+        ita "Impossibile creare il database '%-.192s' (errno: %M)"
+        jpn "'%-.192s' データベースが作れません (errno: %M)"
+        kor "데이타베이스 '%-.192s'를 만들지 못했습니다.. (에러번호: %M)"
+        nor "Kan ikke opprette databasen '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje opprette databasen '%-.192s' (Feilkode: %M)"
+        pol "Nie można stworzyć bazy danych '%-.192s' (Kod błędu: %M)"
+        por "Não pode criar o banco de dados '%-.192s' (erro no. %M)"
+        rum "Nu pot sa creez baza de date '%-.192s' (Eroare: %M)"
+        rus "Невозможно создать базу данных '%-.192s' (ошибка: %M)"
+        serbian "Ne mogu da kreiram bazu '%-.192s' (errno: %M)"
+        slo "Nemôžem vytvoriť databázu '%-.192s' (chybový kód: %M)"
+        spa "No puedo crear base de datos '%-.192s' (Error: %M)"
+        swe "Kan inte skapa databasen '%-.192s' (Felkod: %M)"
+        ukr "Не можу створити базу данних '%-.192s' (помилка: %M)"
 ER_DB_CREATE_EXISTS  
         cze "Nemohu vytvo-Břit databázi '%-.192s'; databáze již existuje"
         dan "Kan ikke oprette databasen '%-.192s'; databasen eksisterer"
@@ -175,80 +175,80 @@ ER_DB_DROP_EXISTS
         swe "Kan inte radera databasen '%-.192s'; databasen finns inte"
         ukr "Не можу видалити базу данних '%-.192s'. База данних не існує"
 ER_DB_DROP_DELETE  
-        cze "Chyba p-Bři rušení databáze (nemohu vymazat '%-.192s', chyba %d)"
-        dan "Fejl ved sletning (drop) af databasen (kan ikke slette '%-.192s', Fejlkode %d)"
-        nla "Fout bij verwijderen database (kan '%-.192s' niet verwijderen, Errcode: %d)"
-        eng "Error dropping database (can't delete '%-.192s', errno: %d)"
-        jps "データベース破棄エラー ('%-.192s' を削除できません, errno: %d)",
-        est "Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.192s', veakood: %d)"
-        fre "Ne peut effacer la base '%-.192s' (erreur %d)"
-        ger "Fehler beim Löschen der Datenbank ('%-.192s' kann nicht gelöscht werden, Fehler: %d)"
-        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή '%-.192s', κωδικός λάθους: %d)"
-        hun "Adatbazis megszuntetesi hiba ('%-.192s' nem torolheto, hibakod: %d)"
-        ita "Errore durante la cancellazione del database (impossibile cancellare '%-.192s', errno: %d)"
-        jpn "データベース破棄エラー ('%-.192s' を削除できません, errno: %d)"
-        kor "데이타베이스 제거 에러('%-.192s'를 삭제할 수 없읍니다, 에러번호: %d)"
-        nor "Feil ved fjerning (drop) av databasen (kan ikke slette '%-.192s', feil %d)"
-        norwegian-ny "Feil ved fjerning (drop) av databasen (kan ikkje slette '%-.192s', feil %d)"
-        pol "Bł?d podczas usuwania bazy danych (nie można usun?ć '%-.192s', bł?d %d)"
-        por "Erro ao eliminar banco de dados (não pode eliminar '%-.192s' - erro no. %d)"
-        rum "Eroare dropuind baza de date (nu pot sa sterg '%-.192s', Eroare: %d)"
-        rus "Ошибка при удалении базы данных (невозможно удалить '%-.192s', ошибка: %d)"
-        serbian "Ne mogu da izbrišem bazu (ne mogu da izbrišem '%-.192s', errno: %d)"
-        slo "Chyba pri mazaní databázy (nemôžem zmazať '%-.192s', chybový kód: %d)"
-        spa "Error eliminando la base de datos(no puedo borrar '%-.192s', error %d)"
-        swe "Fel vid radering av databasen (Kan inte radera '%-.192s'. Felkod: %d)"
-        ukr "Не можу видалити базу данних (Не можу видалити '%-.192s', помилка: %d)"
+        cze "Chyba p-Bři rušení databáze (nemohu vymazat '%-.192s', chyba %M)"
+        dan "Fejl ved sletning (drop) af databasen (kan ikke slette '%-.192s', Fejlkode %M)"
+        nla "Fout bij verwijderen database (kan '%-.192s' niet verwijderen, Errcode: %M)"
+        eng "Error dropping database (can't delete '%-.192s', errno: %M)"
+        jps "データベース破棄エラー ('%-.192s' を削除できません, errno: %M)",
+        est "Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.192s', veakood: %M)"
+        fre "Ne peut effacer la base '%-.192s' (erreur %M)"
+        ger "Fehler beim Löschen der Datenbank ('%-.192s' kann nicht gelöscht werden, Fehler: %M)"
+        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή '%-.192s', κωδικός λάθους: %M)"
+        hun "Adatbazis megszuntetesi hiba ('%-.192s' nem torolheto, hibakod: %M)"
+        ita "Errore durante la cancellazione del database (impossibile cancellare '%-.192s', errno: %M)"
+        jpn "データベース破棄エラー ('%-.192s' を削除できません, errno: %M)"
+        kor "데이타베이스 제거 에러('%-.192s'를 삭제할 수 없읍니다, 에러번호: %M)"
+        nor "Feil ved fjerning (drop) av databasen (kan ikke slette '%-.192s', feil %M)"
+        norwegian-ny "Feil ved fjerning (drop) av databasen (kan ikkje slette '%-.192s', feil %M)"
+        pol "Bł?d podczas usuwania bazy danych (nie można usun?ć '%-.192s', bł?d %M)"
+        por "Erro ao eliminar banco de dados (não pode eliminar '%-.192s' - erro no. %M)"
+        rum "Eroare dropuind baza de date (nu pot sa sterg '%-.192s', Eroare: %M)"
+        rus "Ошибка при удалении базы данных (невозможно удалить '%-.192s', ошибка: %M)"
+        serbian "Ne mogu da izbrišem bazu (ne mogu da izbrišem '%-.192s', errno: %M)"
+        slo "Chyba pri mazaní databázy (nemôžem zmazať '%-.192s', chybový kód: %M)"
+        spa "Error eliminando la base de datos(no puedo borrar '%-.192s', error %M)"
+        swe "Fel vid radering av databasen (Kan inte radera '%-.192s'. Felkod: %M)"
+        ukr "Не можу видалити базу данних (Не можу видалити '%-.192s', помилка: %M)"
 ER_DB_DROP_RMDIR  
-        cze "Chyba p-Bři rušení databáze (nemohu vymazat adresář '%-.192s', chyba %d)"
-        dan "Fejl ved sletting af database (kan ikke slette folderen '%-.192s', Fejlkode %d)"
-        nla "Fout bij verwijderen database (kan rmdir '%-.192s' niet uitvoeren, Errcode: %d)"
-        eng "Error dropping database (can't rmdir '%-.192s', errno: %d)"
-        jps "データベース破棄エラー ('%-.192s' を rmdir できません, errno: %d)",
-        est "Viga andmebaasi kustutamisel (ei suuda kustutada kataloogi '%-.192s', veakood: %d)"
-        fre "Erreur en effaçant la base (rmdir '%-.192s', erreur %d)"
-        ger "Fehler beim Löschen der Datenbank (Verzeichnis '%-.192s' kann nicht gelöscht werden, Fehler: %d)"
-        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή του φακέλλου '%-.192s', κωδικός λάθους: %d)"
-        hun "Adatbazis megszuntetesi hiba ('%-.192s' nem szuntetheto meg, hibakod: %d)"
-        ita "Errore durante la cancellazione del database (impossibile rmdir '%-.192s', errno: %d)"
-        jpn "データベース破棄エラー ('%-.192s' を rmdir できません, errno: %d)"
-        kor "데이타베이스 제거 에러(rmdir '%-.192s'를 할 수 없읍니다, 에러번호: %d)"
-        nor "Feil ved sletting av database (kan ikke slette katalogen '%-.192s', feil %d)"
-        norwegian-ny "Feil ved sletting av database (kan ikkje slette katalogen '%-.192s', feil %d)"
-        pol "Bł?d podczas usuwania bazy danych (nie można wykonać rmdir '%-.192s', bł?d %d)"
-        por "Erro ao eliminar banco de dados (não pode remover diretório '%-.192s' - erro no. %d)"
-        rum "Eroare dropuind baza de date (nu pot sa rmdir '%-.192s', Eroare: %d)"
-        rus "Невозможно удалить базу данных (невозможно удалить каталог '%-.192s', ошибка: %d)"
-        serbian "Ne mogu da izbrišem bazu (ne mogu da izbrišem direktorijum '%-.192s', errno: %d)"
-        slo "Chyba pri mazaní databázy (nemôžem vymazať adresár '%-.192s', chybový kód: %d)"
-        spa "Error eliminando la base de datos (No puedo borrar directorio '%-.192s', error %d)"
-        swe "Fel vid radering av databasen (Kan inte radera biblioteket '%-.192s'. Felkod: %d)"
-        ukr "Не можу видалити базу данних (Не можу видалити теку '%-.192s', помилка: %d)"
+        cze "Chyba p-Bři rušení databáze (nemohu vymazat adresář '%-.192s', chyba %M)"
+        dan "Fejl ved sletting af database (kan ikke slette folderen '%-.192s', Fejlkode %M)"
+        nla "Fout bij verwijderen database (kan rmdir '%-.192s' niet uitvoeren, Errcode: %M)"
+        eng "Error dropping database (can't rmdir '%-.192s', errno: %M)"
+        jps "データベース破棄エラー ('%-.192s' を rmdir できません, errno: %M)",
+        est "Viga andmebaasi kustutamisel (ei suuda kustutada kataloogi '%-.192s', veakood: %M)"
+        fre "Erreur en effaçant la base (rmdir '%-.192s', erreur %M)"
+        ger "Fehler beim Löschen der Datenbank (Verzeichnis '%-.192s' kann nicht gelöscht werden, Fehler: %M)"
+        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή του φακέλλου '%-.192s', κωδικός λάθους: %M)"
+        hun "Adatbazis megszuntetesi hiba ('%-.192s' nem szuntetheto meg, hibakod: %M)"
+        ita "Errore durante la cancellazione del database (impossibile rmdir '%-.192s', errno: %M)"
+        jpn "データベース破棄エラー ('%-.192s' を rmdir できません, errno: %M)"
+        kor "데이타베이스 제거 에러(rmdir '%-.192s'를 할 수 없읍니다, 에러번호: %M)"
+        nor "Feil ved sletting av database (kan ikke slette katalogen '%-.192s', feil %M)"
+        norwegian-ny "Feil ved sletting av database (kan ikkje slette katalogen '%-.192s', feil %M)"
+        pol "Bł?d podczas usuwania bazy danych (nie można wykonać rmdir '%-.192s', bł?d %M)"
+        por "Erro ao eliminar banco de dados (não pode remover diretório '%-.192s' - erro no. %M)"
+        rum "Eroare dropuind baza de date (nu pot sa rmdir '%-.192s', Eroare: %M)"
+        rus "Невозможно удалить базу данных (невозможно удалить каталог '%-.192s', ошибка: %M)"
+        serbian "Ne mogu da izbrišem bazu (ne mogu da izbrišem direktorijum '%-.192s', errno: %M)"
+        slo "Chyba pri mazaní databázy (nemôžem vymazať adresár '%-.192s', chybový kód: %M)"
+        spa "Error eliminando la base de datos (No puedo borrar directorio '%-.192s', error %M)"
+        swe "Fel vid radering av databasen (Kan inte radera biblioteket '%-.192s'. Felkod: %M)"
+        ukr "Не можу видалити базу данних (Не можу видалити теку '%-.192s', помилка: %M)"
 ER_CANT_DELETE_FILE  
-        cze "Chyba p-Bři výmazu '%-.192s' (chybový kód: %d)"
-        dan "Fejl ved sletning af '%-.192s' (Fejlkode: %d)"
-        nla "Fout bij het verwijderen van '%-.192s' (Errcode: %d)"
-        eng "Error on delete of '%-.192s' (errno: %d)"
-        jps "'%-.192s' の削除がエラー (errno: %d)",
-        est "Viga '%-.192s' kustutamisel (veakood: %d)"
-        fre "Erreur en effaçant '%-.192s' (Errcode: %d)"
-        ger "Fehler beim Löschen von '%-.192s' (Fehler: %d)"
-        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή '%-.192s' (κωδικός λάθους: %d)"
-        hun "Torlesi hiba: '%-.192s' (hibakod: %d)"
-        ita "Errore durante la cancellazione di '%-.192s' (errno: %d)"
-        jpn "'%-.192s' の削除がエラー (errno: %d)"
-        kor "'%-.192s' 삭제 중 에러 (에러번호: %d)"
-        nor "Feil ved sletting av '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Feil ved sletting av '%-.192s' (Feilkode: %d)"
-        pol "Bł?d podczas usuwania '%-.192s' (Kod błędu: %d)"
-        por "Erro na remoção de '%-.192s' (erro no. %d)"
-        rum "Eroare incercind sa delete '%-.192s' (Eroare: %d)"
-        rus "Ошибка при удалении '%-.192s' (ошибка: %d)"
-        serbian "Greška pri brisanju '%-.192s' (errno: %d)"
-        slo "Chyba pri mazaní '%-.192s' (chybový kód: %d)"
-        spa "Error en el borrado de '%-.192s' (Error: %d)"
-        swe "Kan inte radera filen '%-.192s' (Felkod: %d)"
-        ukr "Не можу видалити '%-.192s' (помилка: %d)"
+        cze "Chyba p-Bři výmazu '%-.192s' (chybový kód: %M)"
+        dan "Fejl ved sletning af '%-.192s' (Fejlkode: %M)"
+        nla "Fout bij het verwijderen van '%-.192s' (Errcode: %M)"
+        eng "Error on delete of '%-.192s' (errno: %M)"
+        jps "'%-.192s' の削除がエラー (errno: %M)",
+        est "Viga '%-.192s' kustutamisel (veakood: %M)"
+        fre "Erreur en effaçant '%-.192s' (Errcode: %M)"
+        ger "Fehler beim Löschen von '%-.192s' (Fehler: %M)"
+        greek "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή '%-.192s' (κωδικός λάθους: %M)"
+        hun "Torlesi hiba: '%-.192s' (hibakod: %M)"
+        ita "Errore durante la cancellazione di '%-.192s' (errno: %M)"
+        jpn "'%-.192s' の削除がエラー (errno: %M)"
+        kor "'%-.192s' 삭제 중 에러 (에러번호: %M)"
+        nor "Feil ved sletting av '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Feil ved sletting av '%-.192s' (Feilkode: %M)"
+        pol "Bł?d podczas usuwania '%-.192s' (Kod błędu: %M)"
+        por "Erro na remoção de '%-.192s' (erro no. %M)"
+        rum "Eroare incercind sa delete '%-.192s' (Eroare: %M)"
+        rus "Ошибка при удалении '%-.192s' (ошибка: %M)"
+        serbian "Greška pri brisanju '%-.192s' (errno: %M)"
+        slo "Chyba pri mazaní '%-.192s' (chybový kód: %M)"
+        spa "Error en el borrado de '%-.192s' (Error: %M)"
+        swe "Kan inte radera filen '%-.192s' (Felkod: %M)"
+        ukr "Не можу видалити '%-.192s' (помилка: %M)"
 ER_CANT_FIND_SYSTEM_REC  
         cze "Nemohu -Bčíst záznam v systémové tabulce"
         dan "Kan ikke læse posten i systemfolderen"
@@ -275,180 +275,180 @@ ER_CANT_FIND_SYSTEM_REC
         swe "Hittar inte posten i systemregistret"
         ukr "Не можу зчитати запис з системної таблиці"
 ER_CANT_GET_STAT  
-        cze "Nemohu z-Bískat stav '%-.200s' (chybový kód: %d)"
-        dan "Kan ikke læse status af '%-.200s' (Fejlkode: %d)"
-        nla "Kan de status niet krijgen van '%-.200s' (Errcode: %d)"
-        eng "Can't get status of '%-.200s' (errno: %d)"
-        jps "'%-.200s' のステイタスが得られません. (errno: %d)",
-        est "Ei suuda lugeda '%-.200s' olekut (veakood: %d)"
-        fre "Ne peut obtenir le status de '%-.200s' (Errcode: %d)"
-        ger "Kann Status von '%-.200s' nicht ermitteln (Fehler: %d)"
-        greek "Αδύνατη η λήψη πληροφοριών για την κατάσταση του '%-.200s' (κωδικός λάθους: %d)"
-        hun "A(z) '%-.200s' statusza nem allapithato meg (hibakod: %d)"
-        ita "Impossibile leggere lo stato di '%-.200s' (errno: %d)"
-        jpn "'%-.200s' のステイタスが得られません. (errno: %d)"
-        kor "'%-.200s'의 상태를 얻지 못했습니다. (에러번호: %d)"
-        nor "Kan ikke lese statusen til '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje lese statusen til '%-.200s' (Feilkode: %d)"
-        pol "Nie można otrzymać statusu '%-.200s' (Kod błędu: %d)"
-        por "Não pode obter o status de '%-.200s' (erro no. %d)"
-        rum "Nu pot sa obtin statusul lui '%-.200s' (Eroare: %d)"
-        rus "Невозможно получить статусную информацию о '%-.200s' (ошибка: %d)"
-        serbian "Ne mogu da dobijem stanje file-a '%-.200s' (errno: %d)"
-        slo "Nemôžem zistiť stav '%-.200s' (chybový kód: %d)"
-        spa "No puedo obtener el estado de '%-.200s' (Error: %d)"
-        swe "Kan inte läsa filinformationen (stat) från '%-.200s' (Felkod: %d)"
-        ukr "Не можу отримати статус '%-.200s' (помилка: %d)"
+        cze "Nemohu z-Bískat stav '%-.200s' (chybový kód: %M)"
+        dan "Kan ikke læse status af '%-.200s' (Fejlkode: %M)"
+        nla "Kan de status niet krijgen van '%-.200s' (Errcode: %M)"
+        eng "Can't get status of '%-.200s' (errno: %M)"
+        jps "'%-.200s' のステイタスが得られません. (errno: %M)",
+        est "Ei suuda lugeda '%-.200s' olekut (veakood: %M)"
+        fre "Ne peut obtenir le status de '%-.200s' (Errcode: %M)"
+        ger "Kann Status von '%-.200s' nicht ermitteln (Fehler: %M)"
+        greek "Αδύνατη η λήψη πληροφοριών για την κατάσταση του '%-.200s' (κωδικός λάθους: %M)"
+        hun "A(z) '%-.200s' statusza nem allapithato meg (hibakod: %M)"
+        ita "Impossibile leggere lo stato di '%-.200s' (errno: %M)"
+        jpn "'%-.200s' のステイタスが得られません. (errno: %M)"
+        kor "'%-.200s'의 상태를 얻지 못했습니다. (에러번호: %M)"
+        nor "Kan ikke lese statusen til '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje lese statusen til '%-.200s' (Feilkode: %M)"
+        pol "Nie można otrzymać statusu '%-.200s' (Kod błędu: %M)"
+        por "Não pode obter o status de '%-.200s' (erro no. %M)"
+        rum "Nu pot sa obtin statusul lui '%-.200s' (Eroare: %M)"
+        rus "Невозможно получить статусную информацию о '%-.200s' (ошибка: %M)"
+        serbian "Ne mogu da dobijem stanje file-a '%-.200s' (errno: %M)"
+        slo "Nemôžem zistiť stav '%-.200s' (chybový kód: %M)"
+        spa "No puedo obtener el estado de '%-.200s' (Error: %M)"
+        swe "Kan inte läsa filinformationen (stat) från '%-.200s' (Felkod: %M)"
+        ukr "Не можу отримати статус '%-.200s' (помилка: %M)"
 ER_CANT_GET_WD  
-        cze "Chyba p-Bři zjišťování pracovní adresář (chybový kód: %d)"
-        dan "Kan ikke læse aktive folder (Fejlkode: %d)"
-        nla "Kan de werkdirectory niet krijgen (Errcode: %d)"
-        eng "Can't get working directory (errno: %d)"
-        jps "working directory を得る事ができませんでした (errno: %d)",
-        est "Ei suuda identifitseerida jooksvat kataloogi (veakood: %d)"
-        fre "Ne peut obtenir le répertoire de travail (Errcode: %d)"
-        ger "Kann Arbeitsverzeichnis nicht ermitteln (Fehler: %d)"
-        greek "Ο φάκελλος εργασίας δεν βρέθηκε (κωδικός λάθους: %d)"
-        hun "A munkakonyvtar nem allapithato meg (hibakod: %d)"
-        ita "Impossibile leggere la directory di lavoro (errno: %d)"
-        jpn "working directory を得る事ができませんでした (errno: %d)"
-        kor "수행 디렉토리를 찾지 못했습니다. (에러번호: %d)"
-        nor "Kan ikke lese aktiv katalog(Feilkode: %d)"
-        norwegian-ny "Kan ikkje lese aktiv katalog(Feilkode: %d)"
-        pol "Nie można rozpoznać aktualnego katalogu (Kod błędu: %d)"
-        por "Não pode obter o diretório corrente (erro no. %d)"
-        rum "Nu pot sa obtin directorul current (working directory) (Eroare: %d)"
-        rus "Невозможно определить рабочий каталог (ошибка: %d)"
-        serbian "Ne mogu da dobijem trenutni direktorijum (errno: %d)"
-        slo "Nemôžem zistiť pracovný adresár (chybový kód: %d)"
-        spa "No puedo acceder al directorio (Error: %d)"
-        swe "Kan inte inte läsa aktivt bibliotek. (Felkod: %d)"
-        ukr "Не можу визначити робочу теку (помилка: %d)"
+        cze "Chyba p-Bři zjišťování pracovní adresář (chybový kód: %M)"
+        dan "Kan ikke læse aktive folder (Fejlkode: %M)"
+        nla "Kan de werkdirectory niet krijgen (Errcode: %M)"
+        eng "Can't get working directory (errno: %M)"
+        jps "working directory を得る事ができませんでした (errno: %M)",
+        est "Ei suuda identifitseerida jooksvat kataloogi (veakood: %M)"
+        fre "Ne peut obtenir le répertoire de travail (Errcode: %M)"
+        ger "Kann Arbeitsverzeichnis nicht ermitteln (Fehler: %M)"
+        greek "Ο φάκελλος εργασίας δεν βρέθηκε (κωδικός λάθους: %M)"
+        hun "A munkakonyvtar nem allapithato meg (hibakod: %M)"
+        ita "Impossibile leggere la directory di lavoro (errno: %M)"
+        jpn "working directory を得る事ができませんでした (errno: %M)"
+        kor "수행 디렉토리를 찾지 못했습니다. (에러번호: %M)"
+        nor "Kan ikke lese aktiv katalog(Feilkode: %M)"
+        norwegian-ny "Kan ikkje lese aktiv katalog(Feilkode: %M)"
+        pol "Nie można rozpoznać aktualnego katalogu (Kod błędu: %M)"
+        por "Não pode obter o diretório corrente (erro no. %M)"
+        rum "Nu pot sa obtin directorul current (working directory) (Eroare: %M)"
+        rus "Невозможно определить рабочий каталог (ошибка: %M)"
+        serbian "Ne mogu da dobijem trenutni direktorijum (errno: %M)"
+        slo "Nemôžem zistiť pracovný adresár (chybový kód: %M)"
+        spa "No puedo acceder al directorio (Error: %M)"
+        swe "Kan inte inte läsa aktivt bibliotek. (Felkod: %M)"
+        ukr "Не можу визначити робочу теку (помилка: %M)"
 ER_CANT_LOCK  
-        cze "Nemohu uzamknout soubor (chybov-Bý kód: %d)"
-        dan "Kan ikke låse fil (Fejlkode: %d)"
-        nla "Kan de file niet blokeren (Errcode: %d)"
-        eng "Can't lock file (errno: %d)"
-        jps "ファイルをロックできません (errno: %d)",
-        est "Ei suuda lukustada faili (veakood: %d)"
-        fre "Ne peut verrouiller le fichier (Errcode: %d)"
-        ger "Datei kann nicht gesperrt werden (Fehler: %d)"
-        greek "Το αρχείο δεν μπορεί να κλειδωθεί (κωδικός λάθους: %d)"
-        hun "A file nem zarolhato. (hibakod: %d)"
-        ita "Impossibile il locking il file (errno: %d)"
-        jpn "ファイルをロックできません (errno: %d)"
-        kor "화일을 잠그지(lock) 못했습니다. (에러번호: %d)"
-        nor "Kan ikke låse fila (Feilkode: %d)"
-        norwegian-ny "Kan ikkje låse fila (Feilkode: %d)"
-        pol "Nie można zablokować pliku (Kod błędu: %d)"
-        por "Não pode travar o arquivo (erro no. %d)"
-        rum "Nu pot sa lock fisierul (Eroare: %d)"
-        rus "Невозможно поставить блокировку на файле (ошибка: %d)"
-        serbian "Ne mogu da zaključam file (errno: %d)"
-        slo "Nemôžem zamknúť súbor (chybový kód: %d)"
-        spa "No puedo bloquear archivo: (Error: %d)"
-        swe "Kan inte låsa filen. (Felkod: %d)"
-        ukr "Не можу заблокувати файл (помилка: %d)"
+        cze "Nemohu uzamknout soubor (chybov-Bý kód: %M)"
+        dan "Kan ikke låse fil (Fejlkode: %M)"
+        nla "Kan de file niet blokeren (Errcode: %M)"
+        eng "Can't lock file (errno: %M)"
+        jps "ファイルをロックできません (errno: %M)",
+        est "Ei suuda lukustada faili (veakood: %M)"
+        fre "Ne peut verrouiller le fichier (Errcode: %M)"
+        ger "Datei kann nicht gesperrt werden (Fehler: %M)"
+        greek "Το αρχείο δεν μπορεί να κλειδωθεί (κωδικός λάθους: %M)"
+        hun "A file nem zarolhato. (hibakod: %M)"
+        ita "Impossibile il locking il file (errno: %M)"
+        jpn "ファイルをロックできません (errno: %M)"
+        kor "화일을 잠그지(lock) 못했습니다. (에러번호: %M)"
+        nor "Kan ikke låse fila (Feilkode: %M)"
+        norwegian-ny "Kan ikkje låse fila (Feilkode: %M)"
+        pol "Nie można zablokować pliku (Kod błędu: %M)"
+        por "Não pode travar o arquivo (erro no. %M)"
+        rum "Nu pot sa lock fisierul (Eroare: %M)"
+        rus "Невозможно поставить блокировку на файле (ошибка: %M)"
+        serbian "Ne mogu da zaključam file (errno: %M)"
+        slo "Nemôžem zamknúť súbor (chybový kód: %M)"
+        spa "No puedo bloquear archivo: (Error: %M)"
+        swe "Kan inte låsa filen. (Felkod: %M)"
+        ukr "Не можу заблокувати файл (помилка: %M)"
 ER_CANT_OPEN_FILE  
-        cze "Nemohu otev-Břít soubor '%-.200s' (chybový kód: %d)"
-        dan "Kan ikke åbne fil: '%-.200s' (Fejlkode: %d)"
-        nla "Kan de file '%-.200s' niet openen (Errcode: %d)"
-        eng "Can't open file: '%-.200s' (errno: %d)"
-        jps "'%-.200s' ファイルを開く事ができません (errno: %d)",
-        est "Ei suuda avada faili '%-.200s' (veakood: %d)"
-        fre "Ne peut ouvrir le fichier: '%-.200s' (Errcode: %d)"
-        ger "Kann Datei '%-.200s' nicht öffnen (Fehler: %d)"
-        greek "Δεν είναι δυνατό να ανοιχτεί το αρχείο: '%-.200s' (κωδικός λάθους: %d)"
-        hun "A '%-.200s' file nem nyithato meg (hibakod: %d)"
-        ita "Impossibile aprire il file: '%-.200s' (errno: %d)"
-        jpn "'%-.200s' ファイルを開く事ができません (errno: %d)"
-        kor "화일을 열지 못했습니다.: '%-.200s' (에러번호: %d)"
-        nor "Kan ikke åpne fila: '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje åpne fila: '%-.200s' (Feilkode: %d)"
-        pol "Nie można otworzyć pliku: '%-.200s' (Kod błędu: %d)"
-        por "Não pode abrir o arquivo '%-.200s' (erro no. %d)"
-        rum "Nu pot sa deschid fisierul: '%-.200s' (Eroare: %d)"
-        rus "Невозможно открыть файл: '%-.200s' (ошибка: %d)"
-        serbian "Ne mogu da otvorim file: '%-.200s' (errno: %d)"
-        slo "Nemôžem otvoriť súbor: '%-.200s' (chybový kód: %d)"
-        spa "No puedo abrir archivo: '%-.200s' (Error: %d)"
-        swe "Kan inte använda '%-.200s' (Felkod: %d)"
-        ukr "Не можу відкрити файл: '%-.200s' (помилка: %d)"
+        cze "Nemohu otev-Břít soubor '%-.200s' (chybový kód: %M)"
+        dan "Kan ikke åbne fil: '%-.200s' (Fejlkode: %M)"
+        nla "Kan de file '%-.200s' niet openen (Errcode: %M)"
+        eng "Can't open file: '%-.200s' (errno: %M)"
+        jps "'%-.200s' ファイルを開く事ができません (errno: %M)",
+        est "Ei suuda avada faili '%-.200s' (veakood: %M)"
+        fre "Ne peut ouvrir le fichier: '%-.200s' (Errcode: %M)"
+        ger "Kann Datei '%-.200s' nicht öffnen (Fehler: %M)"
+        greek "Δεν είναι δυνατό να ανοιχτεί το αρχείο: '%-.200s' (κωδικός λάθους: %M)"
+        hun "A '%-.200s' file nem nyithato meg (hibakod: %M)"
+        ita "Impossibile aprire il file: '%-.200s' (errno: %M)"
+        jpn "'%-.200s' ファイルを開く事ができません (errno: %M)"
+        kor "화일을 열지 못했습니다.: '%-.200s' (에러번호: %M)"
+        nor "Kan ikke åpne fila: '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje åpne fila: '%-.200s' (Feilkode: %M)"
+        pol "Nie można otworzyć pliku: '%-.200s' (Kod błędu: %M)"
+        por "Não pode abrir o arquivo '%-.200s' (erro no. %M)"
+        rum "Nu pot sa deschid fisierul: '%-.200s' (Eroare: %M)"
+        rus "Невозможно открыть файл: '%-.200s' (ошибка: %M)"
+        serbian "Ne mogu da otvorim file: '%-.200s' (errno: %M)"
+        slo "Nemôžem otvoriť súbor: '%-.200s' (chybový kód: %M)"
+        spa "No puedo abrir archivo: '%-.200s' (Error: %M)"
+        swe "Kan inte använda '%-.200s' (Felkod: %M)"
+        ukr "Не можу відкрити файл: '%-.200s' (помилка: %M)"
 ER_FILE_NOT_FOUND  
-        cze "Nemohu naj-Bít soubor '%-.200s' (chybový kód: %d)"
-        dan "Kan ikke finde fila: '%-.200s' (Fejlkode: %d)"
-        nla "Kan de file: '%-.200s' niet vinden (Errcode: %d)"
-        eng "Can't find file: '%-.200s' (errno: %d)"
-        jps "'%-.200s' ファイルを見付ける事ができません.(errno: %d)",
-        est "Ei suuda leida faili '%-.200s' (veakood: %d)"
-        fre "Ne peut trouver le fichier: '%-.200s' (Errcode: %d)"
-        ger "Kann Datei '%-.200s' nicht finden (Fehler: %d)"
-        greek "Δεν βρέθηκε το αρχείο: '%-.200s' (κωδικός λάθους: %d)"
-        hun "A(z) '%-.200s' file nem talalhato (hibakod: %d)"
-        ita "Impossibile trovare il file: '%-.200s' (errno: %d)"
-        jpn "'%-.200s' ファイルを見付ける事ができません.(errno: %d)"
-        kor "화일을 찾지 못했습니다.: '%-.200s' (에러번호: %d)"
-        nor "Kan ikke finne fila: '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje finne fila: '%-.200s' (Feilkode: %d)"
-        pol "Nie można znaleĽć pliku: '%-.200s' (Kod błędu: %d)"
-        por "Não pode encontrar o arquivo '%-.200s' (erro no. %d)"
-        rum "Nu pot sa gasesc fisierul: '%-.200s' (Eroare: %d)"
-        rus "Невозможно найти файл: '%-.200s' (ошибка: %d)"
-        serbian "Ne mogu da pronađem file: '%-.200s' (errno: %d)"
-        slo "Nemôžem nájsť súbor: '%-.200s' (chybový kód: %d)"
-        spa "No puedo encontrar archivo: '%-.200s' (Error: %d)"
-        swe "Hittar inte filen '%-.200s' (Felkod: %d)"
-        ukr "Не можу знайти файл: '%-.200s' (помилка: %d)"
+        cze "Nemohu naj-Bít soubor '%-.200s' (chybový kód: %M)"
+        dan "Kan ikke finde fila: '%-.200s' (Fejlkode: %M)"
+        nla "Kan de file: '%-.200s' niet vinden (Errcode: %M)"
+        eng "Can't find file: '%-.200s' (errno: %M)"
+        jps "'%-.200s' ファイルを見付ける事ができません.(errno: %M)",
+        est "Ei suuda leida faili '%-.200s' (veakood: %M)"
+        fre "Ne peut trouver le fichier: '%-.200s' (Errcode: %M)"
+        ger "Kann Datei '%-.200s' nicht finden (Fehler: %M)"
+        greek "Δεν βρέθηκε το αρχείο: '%-.200s' (κωδικός λάθους: %M)"
+        hun "A(z) '%-.200s' file nem talalhato (hibakod: %M)"
+        ita "Impossibile trovare il file: '%-.200s' (errno: %M)"
+        jpn "'%-.200s' ファイルを見付ける事ができません.(errno: %M)"
+        kor "화일을 찾지 못했습니다.: '%-.200s' (에러번호: %M)"
+        nor "Kan ikke finne fila: '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje finne fila: '%-.200s' (Feilkode: %M)"
+        pol "Nie można znaleĽć pliku: '%-.200s' (Kod błędu: %M)"
+        por "Não pode encontrar o arquivo '%-.200s' (erro no. %M)"
+        rum "Nu pot sa gasesc fisierul: '%-.200s' (Eroare: %M)"
+        rus "Невозможно найти файл: '%-.200s' (ошибка: %M)"
+        serbian "Ne mogu da pronađem file: '%-.200s' (errno: %M)"
+        slo "Nemôžem nájsť súbor: '%-.200s' (chybový kód: %M)"
+        spa "No puedo encontrar archivo: '%-.200s' (Error: %M)"
+        swe "Hittar inte filen '%-.200s' (Felkod: %M)"
+        ukr "Не можу знайти файл: '%-.200s' (помилка: %M)"
 ER_CANT_READ_DIR  
-        cze "Nemohu -Bčíst adresář '%-.192s' (chybový kód: %d)"
-        dan "Kan ikke læse folder '%-.192s' (Fejlkode: %d)"
-        nla "Kan de directory niet lezen van '%-.192s' (Errcode: %d)"
-        eng "Can't read dir of '%-.192s' (errno: %d)"
-        jps "'%-.192s' ディレクトリが読めません.(errno: %d)",
-        est "Ei suuda lugeda kataloogi '%-.192s' (veakood: %d)"
-        fre "Ne peut lire le répertoire de '%-.192s' (Errcode: %d)"
-        ger "Verzeichnis von '%-.192s' nicht lesbar (Fehler: %d)"
-        greek "Δεν είναι δυνατό να διαβαστεί ο φάκελλος του '%-.192s' (κωδικός λάθους: %d)"
-        hun "A(z) '%-.192s' konyvtar nem olvashato. (hibakod: %d)"
-        ita "Impossibile leggere la directory di '%-.192s' (errno: %d)"
-        jpn "'%-.192s' ディレクトリが読めません.(errno: %d)"
-        kor "'%-.192s'디렉토리를 읽지 못했습니다. (에러번호: %d)"
-        nor "Kan ikke lese katalogen '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje lese katalogen '%-.192s' (Feilkode: %d)"
-        pol "Nie można odczytać katalogu '%-.192s' (Kod błędu: %d)"
-        por "Não pode ler o diretório de '%-.192s' (erro no. %d)"
-        rum "Nu pot sa citesc directorul '%-.192s' (Eroare: %d)"
-        rus "Невозможно прочитать каталог '%-.192s' (ошибка: %d)"
-        serbian "Ne mogu da pročitam direktorijum '%-.192s' (errno: %d)"
-        slo "Nemôžem čítať adresár '%-.192s' (chybový kód: %d)"
-        spa "No puedo leer el directorio de '%-.192s' (Error: %d)"
-        swe "Kan inte läsa från bibliotek '%-.192s' (Felkod: %d)"
-        ukr "Не можу прочитати теку '%-.192s' (помилка: %d)"
+        cze "Nemohu -Bčíst adresář '%-.192s' (chybový kód: %M)"
+        dan "Kan ikke læse folder '%-.192s' (Fejlkode: %M)"
+        nla "Kan de directory niet lezen van '%-.192s' (Errcode: %M)"
+        eng "Can't read dir of '%-.192s' (errno: %M)"
+        jps "'%-.192s' ディレクトリが読めません.(errno: %M)",
+        est "Ei suuda lugeda kataloogi '%-.192s' (veakood: %M)"
+        fre "Ne peut lire le répertoire de '%-.192s' (Errcode: %M)"
+        ger "Verzeichnis von '%-.192s' nicht lesbar (Fehler: %M)"
+        greek "Δεν είναι δυνατό να διαβαστεί ο φάκελλος του '%-.192s' (κωδικός λάθους: %M)"
+        hun "A(z) '%-.192s' konyvtar nem olvashato. (hibakod: %M)"
+        ita "Impossibile leggere la directory di '%-.192s' (errno: %M)"
+        jpn "'%-.192s' ディレクトリが読めません.(errno: %M)"
+        kor "'%-.192s'디렉토리를 읽지 못했습니다. (에러번호: %M)"
+        nor "Kan ikke lese katalogen '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje lese katalogen '%-.192s' (Feilkode: %M)"
+        pol "Nie można odczytać katalogu '%-.192s' (Kod błędu: %M)"
+        por "Não pode ler o diretório de '%-.192s' (erro no. %M)"
+        rum "Nu pot sa citesc directorul '%-.192s' (Eroare: %M)"
+        rus "Невозможно прочитать каталог '%-.192s' (ошибка: %M)"
+        serbian "Ne mogu da pročitam direktorijum '%-.192s' (errno: %M)"
+        slo "Nemôžem čítať adresár '%-.192s' (chybový kód: %M)"
+        spa "No puedo leer el directorio de '%-.192s' (Error: %M)"
+        swe "Kan inte läsa från bibliotek '%-.192s' (Felkod: %M)"
+        ukr "Не можу прочитати теку '%-.192s' (помилка: %M)"
 ER_CANT_SET_WD  
-        cze "Nemohu zm-Běnit adresář na '%-.192s' (chybový kód: %d)"
-        dan "Kan ikke skifte folder til '%-.192s' (Fejlkode: %d)"
-        nla "Kan de directory niet veranderen naar '%-.192s' (Errcode: %d)"
-        eng "Can't change dir to '%-.192s' (errno: %d)"
-        jps "'%-.192s' ディレクトリに chdir できません.(errno: %d)",
-        est "Ei suuda siseneda kataloogi '%-.192s' (veakood: %d)"
-        fre "Ne peut changer le répertoire pour '%-.192s' (Errcode: %d)"
-        ger "Kann nicht in das Verzeichnis '%-.192s' wechseln (Fehler: %d)"
-        greek "Αδύνατη η αλλαγή του τρέχοντος καταλόγου σε '%-.192s' (κωδικός λάθους: %d)"
-        hun "Konyvtarvaltas nem lehetseges a(z) '%-.192s'-ba. (hibakod: %d)"
-        ita "Impossibile cambiare la directory in '%-.192s' (errno: %d)"
-        jpn "'%-.192s' ディレクトリに chdir できません.(errno: %d)"
-        kor "'%-.192s'디렉토리로 이동할 수 없었습니다. (에러번호: %d)"
-        nor "Kan ikke skifte katalog til '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Kan ikkje skifte katalog til '%-.192s' (Feilkode: %d)"
-        pol "Nie można zmienić katalogu na '%-.192s' (Kod błędu: %d)"
-        por "Não pode mudar para o diretório '%-.192s' (erro no. %d)"
-        rum "Nu pot sa schimb directorul '%-.192s' (Eroare: %d)"
-        rus "Невозможно перейти в каталог '%-.192s' (ошибка: %d)"
-        serbian "Ne mogu da promenim direktorijum na '%-.192s' (errno: %d)"
-        slo "Nemôžem vojsť do adresára '%-.192s' (chybový kód: %d)"
-        spa "No puedo cambiar al directorio de '%-.192s' (Error: %d)"
-        swe "Kan inte byta till '%-.192s' (Felkod: %d)"
-        ukr "Не можу перейти у теку '%-.192s' (помилка: %d)"
+        cze "Nemohu zm-Běnit adresář na '%-.192s' (chybový kód: %M)"
+        dan "Kan ikke skifte folder til '%-.192s' (Fejlkode: %M)"
+        nla "Kan de directory niet veranderen naar '%-.192s' (Errcode: %M)"
+        eng "Can't change dir to '%-.192s' (errno: %M)"
+        jps "'%-.192s' ディレクトリに chdir できません.(errno: %M)",
+        est "Ei suuda siseneda kataloogi '%-.192s' (veakood: %M)"
+        fre "Ne peut changer le répertoire pour '%-.192s' (Errcode: %M)"
+        ger "Kann nicht in das Verzeichnis '%-.192s' wechseln (Fehler: %M)"
+        greek "Αδύνατη η αλλαγή του τρέχοντος καταλόγου σε '%-.192s' (κωδικός λάθους: %M)"
+        hun "Konyvtarvaltas nem lehetseges a(z) '%-.192s'-ba. (hibakod: %M)"
+        ita "Impossibile cambiare la directory in '%-.192s' (errno: %M)"
+        jpn "'%-.192s' ディレクトリに chdir できません.(errno: %M)"
+        kor "'%-.192s'디렉토리로 이동할 수 없었습니다. (에러번호: %M)"
+        nor "Kan ikke skifte katalog til '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Kan ikkje skifte katalog til '%-.192s' (Feilkode: %M)"
+        pol "Nie można zmienić katalogu na '%-.192s' (Kod błędu: %M)"
+        por "Não pode mudar para o diretório '%-.192s' (erro no. %M)"
+        rum "Nu pot sa schimb directorul '%-.192s' (Eroare: %M)"
+        rus "Невозможно перейти в каталог '%-.192s' (ошибка: %M)"
+        serbian "Ne mogu da promenim direktorijum na '%-.192s' (errno: %M)"
+        slo "Nemôžem vojsť do adresára '%-.192s' (chybový kód: %M)"
+        spa "No puedo cambiar al directorio de '%-.192s' (Error: %M)"
+        swe "Kan inte byta till '%-.192s' (Felkod: %M)"
+        ukr "Не можу перейти у теку '%-.192s' (помилка: %M)"
 ER_CHECKREAD  
         cze "Z-Báznam byl změněn od posledního čtení v tabulce '%-.192s'"
         dan "Posten er ændret siden sidste læsning '%-.192s'"
@@ -523,103 +523,103 @@ ER_DUP_KEY 23000
         swe "Kan inte skriva, dubbel söknyckel i register '%-.192s'"
         ukr "Не можу записати, дублюючийся ключ в таблиці '%-.192s'"
 ER_ERROR_ON_CLOSE  
-        cze "Chyba p-Bři zavírání '%-.192s' (chybový kód: %d)"
-        dan "Fejl ved lukning af '%-.192s' (Fejlkode: %d)"
-        nla "Fout bij het sluiten van '%-.192s' (Errcode: %d)"
-        eng "Error on close of '%-.192s' (errno: %d)"
-        est "Viga faili '%-.192s' sulgemisel (veakood: %d)"
-        fre "Erreur a la fermeture de '%-.192s' (Errcode: %d)"
-        ger "Fehler beim Schließen von '%-.192s' (Fehler: %d)"
-        greek "Παρουσιάστηκε πρόβλημα κλείνοντας το '%-.192s' (κωδικός λάθους: %d)"
-        hun "Hiba a(z) '%-.192s' zarasakor. (hibakod: %d)"
-        ita "Errore durante la chiusura di '%-.192s' (errno: %d)"
-        kor "'%-.192s'닫는 중 에러 (에러번호: %d)"
-        nor "Feil ved lukking av '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Feil ved lukking av '%-.192s' (Feilkode: %d)"
-        pol "Bł?d podczas zamykania '%-.192s' (Kod błędu: %d)"
-        por "Erro ao fechar '%-.192s' (erro no. %d)"
-        rum "Eroare inchizind '%-.192s' (errno: %d)"
-        rus "Ошибка при закрытии '%-.192s' (ошибка: %d)"
-        serbian "Greška pri zatvaranju '%-.192s' (errno: %d)"
-        slo "Chyba pri zatváraní '%-.192s' (chybový kód: %d)"
-        spa "Error en el cierre de '%-.192s' (Error: %d)"
-        swe "Fick fel vid stängning av '%-.192s' (Felkod: %d)"
-        ukr "Не можу закрити '%-.192s' (помилка: %d)"
+        cze "Chyba p-Bři zavírání '%-.192s' (chybový kód: %M)"
+        dan "Fejl ved lukning af '%-.192s' (Fejlkode: %M)"
+        nla "Fout bij het sluiten van '%-.192s' (Errcode: %M)"
+        eng "Error on close of '%-.192s' (errno: %M)"
+        est "Viga faili '%-.192s' sulgemisel (veakood: %M)"
+        fre "Erreur a la fermeture de '%-.192s' (Errcode: %M)"
+        ger "Fehler beim Schließen von '%-.192s' (Fehler: %M)"
+        greek "Παρουσιάστηκε πρόβλημα κλείνοντας το '%-.192s' (κωδικός λάθους: %M)"
+        hun "Hiba a(z) '%-.192s' zarasakor. (hibakod: %M)"
+        ita "Errore durante la chiusura di '%-.192s' (errno: %M)"
+        kor "'%-.192s'닫는 중 에러 (에러번호: %M)"
+        nor "Feil ved lukking av '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Feil ved lukking av '%-.192s' (Feilkode: %M)"
+        pol "Bł?d podczas zamykania '%-.192s' (Kod błędu: %M)"
+        por "Erro ao fechar '%-.192s' (erro no. %M)"
+        rum "Eroare inchizind '%-.192s' (errno: %M)"
+        rus "Ошибка при закрытии '%-.192s' (ошибка: %M)"
+        serbian "Greška pri zatvaranju '%-.192s' (errno: %M)"
+        slo "Chyba pri zatváraní '%-.192s' (chybový kód: %M)"
+        spa "Error en el cierre de '%-.192s' (Error: %M)"
+        swe "Fick fel vid stängning av '%-.192s' (Felkod: %M)"
+        ukr "Не можу закрити '%-.192s' (помилка: %M)"
 ER_ERROR_ON_READ  
-        cze "Chyba p-Bři čtení souboru '%-.200s' (chybový kód: %d)"
-        dan "Fejl ved læsning af '%-.200s' (Fejlkode: %d)"
-        nla "Fout bij het lezen van file '%-.200s' (Errcode: %d)"
-        eng "Error reading file '%-.200s' (errno: %d)"
-        jps "'%-.200s' ファイルの読み込みエラー (errno: %d)",
-        est "Viga faili '%-.200s' lugemisel (veakood: %d)"
-        fre "Erreur en lecture du fichier '%-.200s' (Errcode: %d)"
-        ger "Fehler beim Lesen der Datei '%-.200s' (Fehler: %d)"
-        greek "Πρόβλημα κατά την ανάγνωση του αρχείου '%-.200s' (κωδικός λάθους: %d)"
-        hun "Hiba a '%-.200s'file olvasasakor. (hibakod: %d)"
-        ita "Errore durante la lettura del file '%-.200s' (errno: %d)"
-        jpn "'%-.200s' ファイルの読み込みエラー (errno: %d)"
-        kor "'%-.200s'화일 읽기 에러 (에러번호: %d)"
-        nor "Feil ved lesing av '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Feil ved lesing av '%-.200s' (Feilkode: %d)"
-        pol "Bł?d podczas odczytu pliku '%-.200s' (Kod błędu: %d)"
-        por "Erro ao ler arquivo '%-.200s' (erro no. %d)"
-        rum "Eroare citind fisierul '%-.200s' (errno: %d)"
-        rus "Ошибка чтения файла '%-.200s' (ошибка: %d)"
-        serbian "Greška pri čitanju file-a '%-.200s' (errno: %d)"
-        slo "Chyba pri čítaní súboru '%-.200s' (chybový kód: %d)"
-        spa "Error leyendo el fichero '%-.200s' (Error: %d)"
-        swe "Fick fel vid läsning av '%-.200s' (Felkod %d)"
-        ukr "Не можу прочитати файл '%-.200s' (помилка: %d)"
+        cze "Chyba p-Bři čtení souboru '%-.200s' (chybový kód: %M)"
+        dan "Fejl ved læsning af '%-.200s' (Fejlkode: %M)"
+        nla "Fout bij het lezen van file '%-.200s' (Errcode: %M)"
+        eng "Error reading file '%-.200s' (errno: %M)"
+        jps "'%-.200s' ファイルの読み込みエラー (errno: %M)",
+        est "Viga faili '%-.200s' lugemisel (veakood: %M)"
+        fre "Erreur en lecture du fichier '%-.200s' (Errcode: %M)"
+        ger "Fehler beim Lesen der Datei '%-.200s' (Fehler: %M)"
+        greek "Πρόβλημα κατά την ανάγνωση του αρχείου '%-.200s' (κωδικός λάθους: %M)"
+        hun "Hiba a '%-.200s'file olvasasakor. (hibakod: %M)"
+        ita "Errore durante la lettura del file '%-.200s' (errno: %M)"
+        jpn "'%-.200s' ファイルの読み込みエラー (errno: %M)"
+        kor "'%-.200s'화일 읽기 에러 (에러번호: %M)"
+        nor "Feil ved lesing av '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Feil ved lesing av '%-.200s' (Feilkode: %M)"
+        pol "Bł?d podczas odczytu pliku '%-.200s' (Kod błędu: %M)"
+        por "Erro ao ler arquivo '%-.200s' (erro no. %M)"
+        rum "Eroare citind fisierul '%-.200s' (errno: %M)"
+        rus "Ошибка чтения файла '%-.200s' (ошибка: %M)"
+        serbian "Greška pri čitanju file-a '%-.200s' (errno: %M)"
+        slo "Chyba pri čítaní súboru '%-.200s' (chybový kód: %M)"
+        spa "Error leyendo el fichero '%-.200s' (Error: %M)"
+        swe "Fick fel vid läsning av '%-.200s' (Felkod %M)"
+        ukr "Не можу прочитати файл '%-.200s' (помилка: %M)"
 ER_ERROR_ON_RENAME  
-        cze "Chyba p-Bři přejmenování '%-.210s' na '%-.210s' (chybový kód: %d)"
-        dan "Fejl ved omdøbning af '%-.210s' til '%-.210s' (Fejlkode: %d)"
-        nla "Fout bij het hernoemen van '%-.210s' naar '%-.210s' (Errcode: %d)"
-        eng "Error on rename of '%-.210s' to '%-.210s' (errno: %d)"
-        jps "'%-.210s' を '%-.210s' に rename できません (errno: %d)",
-        est "Viga faili '%-.210s' ümbernimetamisel '%-.210s'-ks (veakood: %d)"
-        fre "Erreur en renommant '%-.210s' en '%-.210s' (Errcode: %d)"
-        ger "Fehler beim Umbenennen von '%-.210s' in '%-.210s' (Fehler: %d)"
-        greek "Πρόβλημα κατά την μετονομασία του αρχείου '%-.210s' to '%-.210s' (κωδικός λάθους: %d)"
-        hun "Hiba a '%-.210s' file atnevezesekor '%-.210s'. (hibakod: %d)"
-        ita "Errore durante la rinominazione da '%-.210s' a '%-.210s' (errno: %d)"
-        jpn "'%-.210s' を '%-.210s' に rename できません (errno: %d)"
-        kor "'%-.210s'를 '%-.210s'로 이름 변경중 에러 (에러번호: %d)"
-        nor "Feil ved omdøping av '%-.210s' til '%-.210s' (Feilkode: %d)"
-        norwegian-ny "Feil ved omdøyping av '%-.210s' til '%-.210s' (Feilkode: %d)"
-        pol "Bł?d podczas zmieniania nazwy '%-.210s' na '%-.210s' (Kod błędu: %d)"
-        por "Erro ao renomear '%-.210s' para '%-.210s' (erro no. %d)"
-        rum "Eroare incercind sa renumesc '%-.210s' in '%-.210s' (errno: %d)"
-        rus "Ошибка при переименовании '%-.210s' в '%-.210s' (ошибка: %d)"
-        serbian "Greška pri promeni imena '%-.210s' na '%-.210s' (errno: %d)"
-        slo "Chyba pri premenovávaní '%-.210s' na '%-.210s' (chybový kód: %d)"
-        spa "Error en el renombrado de '%-.210s' a '%-.210s' (Error: %d)"
-        swe "Kan inte byta namn från '%-.210s' till '%-.210s' (Felkod: %d)"
-        ukr "Не можу перейменувати '%-.210s' у '%-.210s' (помилка: %d)"
+        cze "Chyba p-Bři přejmenování '%-.210s' na '%-.210s' (chybový kód: %M)"
+        dan "Fejl ved omdøbning af '%-.210s' til '%-.210s' (Fejlkode: %M)"
+        nla "Fout bij het hernoemen van '%-.210s' naar '%-.210s' (Errcode: %M)"
+        eng "Error on rename of '%-.210s' to '%-.210s' (errno: %M)"
+        jps "'%-.210s' を '%-.210s' に rename できません (errno: %M)",
+        est "Viga faili '%-.210s' ümbernimetamisel '%-.210s'-ks (veakood: %M)"
+        fre "Erreur en renommant '%-.210s' en '%-.210s' (Errcode: %M)"
+        ger "Fehler beim Umbenennen von '%-.210s' in '%-.210s' (Fehler: %M)"
+        greek "Πρόβλημα κατά την μετονομασία του αρχείου '%-.210s' to '%-.210s' (κωδικός λάθους: %M)"
+        hun "Hiba a '%-.210s' file atnevezesekor '%-.210s'. (hibakod: %M)"
+        ita "Errore durante la rinominazione da '%-.210s' a '%-.210s' (errno: %M)"
+        jpn "'%-.210s' を '%-.210s' に rename できません (errno: %M)"
+        kor "'%-.210s'를 '%-.210s'로 이름 변경중 에러 (에러번호: %M)"
+        nor "Feil ved omdøping av '%-.210s' til '%-.210s' (Feilkode: %M)"
+        norwegian-ny "Feil ved omdøyping av '%-.210s' til '%-.210s' (Feilkode: %M)"
+        pol "Bł?d podczas zmieniania nazwy '%-.210s' na '%-.210s' (Kod błędu: %M)"
+        por "Erro ao renomear '%-.210s' para '%-.210s' (erro no. %M)"
+        rum "Eroare incercind sa renumesc '%-.210s' in '%-.210s' (errno: %M)"
+        rus "Ошибка при переименовании '%-.210s' в '%-.210s' (ошибка: %M)"
+        serbian "Greška pri promeni imena '%-.210s' na '%-.210s' (errno: %M)"
+        slo "Chyba pri premenovávaní '%-.210s' na '%-.210s' (chybový kód: %M)"
+        spa "Error en el renombrado de '%-.210s' a '%-.210s' (Error: %M)"
+        swe "Kan inte byta namn från '%-.210s' till '%-.210s' (Felkod: %M)"
+        ukr "Не можу перейменувати '%-.210s' у '%-.210s' (помилка: %M)"
 ER_ERROR_ON_WRITE  
-        cze "Chyba p-Bři zápisu do souboru '%-.200s' (chybový kód: %d)"
-        dan "Fejl ved skriving av filen '%-.200s' (Fejlkode: %d)"
-        nla "Fout bij het wegschrijven van file '%-.200s' (Errcode: %d)"
-        eng "Error writing file '%-.200s' (errno: %d)"
-        jps "'%-.200s' ファイルを書く事ができません (errno: %d)",
-        est "Viga faili '%-.200s' kirjutamisel (veakood: %d)"
-        fre "Erreur d'écriture du fichier '%-.200s' (Errcode: %d)"
-        ger "Fehler beim Speichern der Datei '%-.200s' (Fehler: %d)"
-        greek "Πρόβλημα κατά την αποθήκευση του αρχείου '%-.200s' (κωδικός λάθους: %d)"
-        hun "Hiba a '%-.200s' file irasakor. (hibakod: %d)"
-        ita "Errore durante la scrittura del file '%-.200s' (errno: %d)"
-        jpn "'%-.200s' ファイルを書く事ができません (errno: %d)"
-        kor "'%-.200s'화일 기록 중 에러 (에러번호: %d)"
-        nor "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
-        norwegian-ny "Feil ved skriving av fila '%-.200s' (Feilkode: %d)"
-        pol "Bł?d podczas zapisywania pliku '%-.200s' (Kod błędu: %d)"
-        por "Erro ao gravar arquivo '%-.200s' (erro no. %d)"
-        rum "Eroare scriind fisierul '%-.200s' (errno: %d)"
-        rus "Ошибка записи в файл '%-.200s' (ошибка: %d)"
-        serbian "Greška pri upisu '%-.200s' (errno: %d)"
-        slo "Chyba pri zápise do súboru '%-.200s' (chybový kód: %d)"
-        spa "Error escribiendo el archivo '%-.200s' (Error: %d)"
-        swe "Fick fel vid skrivning till '%-.200s' (Felkod %d)"
-        ukr "Не можу записати файл '%-.200s' (помилка: %d)"
+        cze "Chyba p-Bři zápisu do souboru '%-.200s' (chybový kód: %M)"
+        dan "Fejl ved skriving av filen '%-.200s' (Fejlkode: %M)"
+        nla "Fout bij het wegschrijven van file '%-.200s' (Errcode: %M)"
+        eng "Error writing file '%-.200s' (errno: %M)"
+        jps "'%-.200s' ファイルを書く事ができません (errno: %M)",
+        est "Viga faili '%-.200s' kirjutamisel (veakood: %M)"
+        fre "Erreur d'écriture du fichier '%-.200s' (Errcode: %M)"
+        ger "Fehler beim Speichern der Datei '%-.200s' (Fehler: %M)"
+        greek "Πρόβλημα κατά την αποθήκευση του αρχείου '%-.200s' (κωδικός λάθους: %M)"
+        hun "Hiba a '%-.200s' file irasakor. (hibakod: %M)"
+        ita "Errore durante la scrittura del file '%-.200s' (errno: %M)"
+        jpn "'%-.200s' ファイルを書く事ができません (errno: %M)"
+        kor "'%-.200s'화일 기록 중 에러 (에러번호: %M)"
+        nor "Feil ved skriving av fila '%-.200s' (Feilkode: %M)"
+        norwegian-ny "Feil ved skriving av fila '%-.200s' (Feilkode: %M)"
+        pol "Bł?d podczas zapisywania pliku '%-.200s' (Kod błędu: %M)"
+        por "Erro ao gravar arquivo '%-.200s' (erro no. %M)"
+        rum "Eroare scriind fisierul '%-.200s' (errno: %M)"
+        rus "Ошибка записи в файл '%-.200s' (ошибка: %M)"
+        serbian "Greška pri upisu '%-.200s' (errno: %M)"
+        slo "Chyba pri zápise do súboru '%-.200s' (chybový kód: %M)"
+        spa "Error escribiendo el archivo '%-.200s' (Error: %M)"
+        swe "Fick fel vid skrivning till '%-.200s' (Felkod %M)"
+        ukr "Не можу записати файл '%-.200s' (помилка: %M)"
 ER_FILE_USED  
         cze "'%-.192s' je zam-Bčen proti změnám"
         dan "'%-.192s' er låst mod opdateringer"
@@ -696,29 +696,29 @@ ER_FORM_NOT_FOUND
         swe "Formulär '%-.192s' finns inte i '%-.192s'"
         ukr "Вигляд '%-.192s' не існує для '%-.192s'"
 ER_GET_ERRNO  
-        cze "Obsluha tabulky vr-Bátila chybu %d"
-        dan "Modtog fejl %d fra tabel håndteringen"
-        nla "Fout %d van tabel handler"
-        eng "Got error %d from storage engine"
-        est "Tabeli handler tagastas vea %d"
-        fre "Reçu l'erreur %d du handler de la table"
-        ger "Fehler %d (Speicher-Engine)"
-        greek "Ελήφθη μήνυμα λάθους %d από τον χειριστή πίνακα (table handler)"
-        hun "%d hibajelzes a tablakezelotol"
-        ita "Rilevato l'errore %d dal gestore delle tabelle"
-        jpn "Got error %d from table handler"
-        kor "테이블 handler에서 %d 에러가 발생 하였습니다."
-        nor "Mottok feil %d fra tabell håndterer"
-        norwegian-ny "Mottok feil %d fra tabell handterar"
-        pol "Otrzymano bł?d %d z obsługi tabeli"
-        por "Obteve erro %d no manipulador de tabelas"
-        rum "Eroarea %d obtinuta din handlerul tabelei"
-        rus "Получена ошибка %d от обработчика таблиц"
-        serbian "Handler tabela je vratio grešku %d"
-        slo "Obsluha tabuľky vrátila chybu %d"
-        spa "Error %d desde el manejador de la tabla"
-        swe "Fick felkod %d från databashanteraren"
-        ukr "Отримано помилку %d від дескриптора таблиці"
+        cze "Obsluha tabulky vr-Bátila chybu %M"
+        dan "Modtog fejl %M fra tabel håndteringen"
+        nla "Fout %M van tabel handler"
+        eng "Got error %M from storage engine"
+        est "Tabeli handler tagastas vea %M"
+        fre "Reçu l'erreur %M du handler de la table"
+        ger "Fehler %M (Speicher-Engine)"
+        greek "Ελήφθη μήνυμα λάθους %M από τον χειριστή πίνακα (table handler)"
+        hun "%M hibajelzes a tablakezelotol"
+        ita "Rilevato l'errore %M dal gestore delle tabelle"
+        jpn "Got error %M from table handler"
+        kor "테이블 handler에서 %M 에러가 발생 하였습니다."
+        nor "Mottok feil %M fra tabell håndterer"
+        norwegian-ny "Mottok feil %M fra tabell handterar"
+        pol "Otrzymano bł?d %M z obsługi tabeli"
+        por "Obteve erro %M no manipulador de tabelas"
+        rum "Eroarea %M obtinuta din handlerul tabelei"
+        rus "Получена ошибка %M от обработчика таблиц"
+        serbian "Handler tabela je vratio grešku %M"
+        slo "Obsluha tabuľky vrátila chybu %M"
+        spa "Error %M desde el manejador de la tabla"
+        swe "Fick felkod %M från databashanteraren"
+        ukr "Отримано помилку %M від дескриптора таблиці"
 ER_ILLEGAL_HA  
         cze "Obsluha tabulky '%-.192s' nem-Bá tento parametr"
         dan "Denne mulighed eksisterer ikke for tabeltypen '%-.192s'"
@@ -919,30 +919,30 @@ ER_OUT_OF_SORTMEMORY HY001 S1001
         swe "Sorteringsbufferten räcker inte till. Kontrollera startparametrarna"
         ukr "Брак пам'яті для сортування. Треба збільшити розмір буфера сортування у сервера"
 ER_UNEXPECTED_EOF  
-        cze "Neo-Bčekávaný konec souboru při čtení '%-.192s' (chybový kód: %d)"
-        dan "Uventet afslutning på fil (eof) ved læsning af filen '%-.192s' (Fejlkode: %d)"
-        nla "Onverwachte eof gevonden tijdens het lezen van file '%-.192s' (Errcode: %d)"
-        eng "Unexpected EOF found when reading file '%-.192s' (errno: %d)"
-        jps "'%-.192s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %d)",
-        est "Ootamatu faililõpumärgend faili '%-.192s' lugemisel (veakood: %d)"
-        fre "Fin de fichier inattendue en lisant '%-.192s' (Errcode: %d)"
-        ger "Unerwartetes Ende beim Lesen der Datei '%-.192s' (Fehler: %d)"
-        greek "Κατά τη διάρκεια της ανάγνωσης, βρέθηκε απροσδόκητα το τέλος του αρχείου '%-.192s' (κωδικός λάθους: %d)"
-        hun "Varatlan filevege-jel a '%-.192s'olvasasakor. (hibakod: %d)"
-        ita "Fine del file inaspettata durante la lettura del file '%-.192s' (errno: %d)"
-        jpn "'%-.192s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %d)"
-        kor "'%-.192s' 화일을 읽는 도중 잘못된 eof을 발견 (에러번호: %d)"
-        nor "Uventet slutt på fil (eof) ved lesing av filen '%-.192s' (Feilkode: %d)"
-        norwegian-ny "Uventa slutt på fil (eof) ved lesing av fila '%-.192s' (Feilkode: %d)"
-        pol "Nieoczekiwany 'eof' napotkany podczas czytania z pliku '%-.192s' (Kod błędu: %d)"
-        por "Encontrado fim de arquivo inesperado ao ler arquivo '%-.192s' (erro no. %d)"
-        rum "Sfirsit de fisier neasteptat in citirea fisierului '%-.192s' (errno: %d)"
-        rus "Неожиданный конец файла '%-.192s' (ошибка: %d)"
-        serbian "Neočekivani kraj pri čitanju file-a '%-.192s' (errno: %d)"
-        slo "Neočakávaný koniec súboru pri čítaní '%-.192s' (chybový kód: %d)"
-        spa "Inesperado fin de ficheroU mientras leiamos el archivo '%-.192s' (Error: %d)"
-        swe "Oväntat filslut vid läsning från '%-.192s' (Felkod: %d)"
-        ukr "Хибний кінець файлу '%-.192s' (помилка: %d)"
+        cze "Neo-Bčekávaný konec souboru při čtení '%-.192s' (chybový kód: %M)"
+        dan "Uventet afslutning på fil (eof) ved læsning af filen '%-.192s' (Fejlkode: %M)"
+        nla "Onverwachte eof gevonden tijdens het lezen van file '%-.192s' (Errcode: %M)"
+        eng "Unexpected EOF found when reading file '%-.192s' (errno: %M)"
+        jps "'%-.192s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %M)",
+        est "Ootamatu faililõpumärgend faili '%-.192s' lugemisel (veakood: %M)"
+        fre "Fin de fichier inattendue en lisant '%-.192s' (Errcode: %M)"
+        ger "Unerwartetes Ende beim Lesen der Datei '%-.192s' (Fehler: %M)"
+        greek "Κατά τη διάρκεια της ανάγνωσης, βρέθηκε απροσδόκητα το τέλος του αρχείου '%-.192s' (κωδικός λάθους: %M)"
+        hun "Varatlan filevege-jel a '%-.192s'olvasasakor. (hibakod: %M)"
+        ita "Fine del file inaspettata durante la lettura del file '%-.192s' (errno: %M)"
+        jpn "'%-.192s' ファイルを読み込み中に EOF が予期せぬ所で現れました. (errno: %M)"
+        kor "'%-.192s' 화일을 읽는 도중 잘못된 eof을 발견 (에러번호: %M)"
+        nor "Uventet slutt på fil (eof) ved lesing av filen '%-.192s' (Feilkode: %M)"
+        norwegian-ny "Uventa slutt på fil (eof) ved lesing av fila '%-.192s' (Feilkode: %M)"
+        pol "Nieoczekiwany 'eof' napotkany podczas czytania z pliku '%-.192s' (Kod błędu: %M)"
+        por "Encontrado fim de arquivo inesperado ao ler arquivo '%-.192s' (erro no. %M)"
+        rum "Sfirsit de fisier neasteptat in citirea fisierului '%-.192s' (errno: %M)"
+        rus "Неожиданный конец файла '%-.192s' (ошибка: %M)"
+        serbian "Neočekivani kraj pri čitanju file-a '%-.192s' (errno: %M)"
+        slo "Neočakávaný koniec súboru pri čítaní '%-.192s' (chybový kód: %M)"
+        spa "Inesperado fin de ficheroU mientras leiamos el archivo '%-.192s' (Error: %M)"
+        swe "Oväntat filslut vid läsning från '%-.192s' (Felkod: %M)"
+        ukr "Хибний кінець файлу '%-.192s' (помилка: %M)"
 ER_CON_COUNT_ERROR 08004 
         cze "P-Bříliš mnoho spojení"
         dan "For mange forbindelser (connections)"
@@ -2808,7 +2808,7 @@ ER_TOO_BIG_ROWSIZE 42000
         cze "-BŘádek je příliš velký. Maximální velikost řádku, nepočítaje položky blob, je %ld. Musíte změnit některé položky na blob"
         dan "For store poster. Max post størrelse, uden BLOB's, er %ld. Du må lave nogle felter til BLOB's"
         nla "Rij-grootte is groter dan toegestaan. Maximale rij grootte, blobs niet meegeteld, is %ld. U dient sommige velden in blobs te veranderen."
-        eng "Row size too large. The maximum row size for the used table type, not counting BLOBs, is %ld. You have to change some columns to TEXT or BLOBs"
+        eng "Row size too large. The maximum row size for the used table type, not counting BLOBs, is %ld. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs"
         jps "row size が大きすぎます. BLOB を含まない場合の row size の最大は %ld です. いくつかの field を BLOB に変えてください.",
         est "Liiga pikk kirje. Kirje maksimumpikkus arvestamata BLOB-tüüpi välju on %ld. Muuda mõned väljad BLOB-tüüpi väljadeks"
         fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %ld. Changez le type de quelques colonnes en BLOB"
@@ -3150,28 +3150,28 @@ ER_UPDATE_INFO
         swe "Rader: %ld  Uppdaterade: %ld  Varningar: %ld"
         ukr "Записів відповідає: %ld  Змінено: %ld  Застережень: %ld"
 ER_CANT_CREATE_THREAD  
-        cze "Nemohu vytvo-Břit nový thread (errno %d). Pokud je ještě nějaká volná paměť, podívejte se do manuálu na část o chybách specifických pro jednotlivé operační systémy"
-        dan "Kan ikke danne en ny tråd (fejl nr. %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl"
-        nla "Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout"
-        eng "Can't create a new thread (errno %d); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug"
-        jps "新規にスレッドが作れませんでした (errno %d). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい.",
-        est "Ei suuda luua uut lõime (veakood %d). Kui mälu ei ole otsas, on tõenäoliselt tegemist operatsioonisüsteemispetsiifilise veaga"
-        fre "Impossible de créer une nouvelle tâche (errno %d). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS"
-        ger "Kann keinen neuen Thread erzeugen (Fehler: %d). Sollte noch Speicher verfügbar sein, bitte im Handbuch wegen möglicher Fehler im Betriebssystem nachschlagen"
-        hun "Uj thread letrehozasa nem lehetseges (Hibakod: %d). Amenyiben van meg szabad memoria, olvassa el a kezikonyv operacios rendszerfuggo hibalehetosegekrol szolo reszet"
-        ita "Impossibile creare un nuovo thread (errno %d). Se non ci sono problemi di memoria disponibile puoi consultare il manuale per controllare possibili problemi dipendenti dal SO"
-        jpn "新規にスレッドが作れませんでした (errno %d). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい."
-        kor "새로운 쓰레드를 만들 수 없습니다.(에러번호 %d). 만약 여유메모리가 있다면 OS-dependent버그 의 메뉴얼 부분을 찾아보시오."
-        nor "Can't create a new thread (errno %d); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
-        norwegian-ny "Can't create a new thread (errno %d); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
-        pol "Can't create a new thread (errno %d); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
-        por "Não pode criar uma nova 'thread' (erro no. %d). Se você não estiver sem memória disponível, você pode consultar o manual sobre um possível 'bug' dependente do sistema operacional"
-        rum "Nu pot crea un thread nou (Eroare %d). Daca mai aveti memorie disponibila in sistem, puteti consulta manualul - ar putea exista un potential bug in legatura cu sistemul de operare"
-        rus "Невозможно создать новый поток (ошибка %d). Если это не ситуация, связанная с нехваткой памяти, то вам следует изучить документацию на предмет описания возможной ошибки работы в конкретной ОС"
-        serbian "Ne mogu da kreiram novi thread (errno %d). Ako imate još slobodne memorije, trebali biste da pogledate u priručniku da li je ovo specifična greška vašeg operativnog sistema"
-        spa "No puedo crear un nuevo thread (errno %d). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO"
-        swe "Kan inte skapa en ny tråd (errno %d)"
-        ukr "Не можу створити нову гілку (помилка %d). Якщо ви не використали усю пам'ять, то прочитайте документацію до вашої ОС - можливо це помилка ОС"
+        cze "Nemohu vytvo-Břit nový thread (errno %M). Pokud je ještě nějaká volná paměť, podívejte se do manuálu na část o chybách specifických pro jednotlivé operační systémy"
+        dan "Kan ikke danne en ny tråd (fejl nr. %M). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl"
+        nla "Kan geen nieuwe thread aanmaken (Errcode: %M). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout"
+        eng "Can't create a new thread (errno %M); if you are not out of available memory, you can consult the manual for a possible OS-dependent bug"
+        jps "新規にスレッドが作れませんでした (errno %M). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい.",
+        est "Ei suuda luua uut lõime (veakood %M). Kui mälu ei ole otsas, on tõenäoliselt tegemist operatsioonisüsteemispetsiifilise veaga"
+        fre "Impossible de créer une nouvelle tâche (errno %M). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS"
+        ger "Kann keinen neuen Thread erzeugen (Fehler: %M). Sollte noch Speicher verfügbar sein, bitte im Handbuch wegen möglicher Fehler im Betriebssystem nachschlagen"
+        hun "Uj thread letrehozasa nem lehetseges (Hibakod: %M). Amenyiben van meg szabad memoria, olvassa el a kezikonyv operacios rendszerfuggo hibalehetosegekrol szolo reszet"
+        ita "Impossibile creare un nuovo thread (errno %M). Se non ci sono problemi di memoria disponibile puoi consultare il manuale per controllare possibili problemi dipendenti dal SO"
+        jpn "新規にスレッドが作れませんでした (errno %M). もし最大使用許可メモリー数を越えていないのにエラーが発生しているなら, マニュアルの中から 'possible OS-dependent bug' という文字を探してくみてださい."
+        kor "새로운 쓰레드를 만들 수 없습니다.(에러번호 %M). 만약 여유메모리가 있다면 OS-dependent버그 의 메뉴얼 부분을 찾아보시오."
+        nor "Can't create a new thread (errno %M); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
+        norwegian-ny "Can't create a new thread (errno %M); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
+        pol "Can't create a new thread (errno %M); if you are not out of available memory you can consult the manual for any possible OS dependent bug"
+        por "Não pode criar uma nova 'thread' (erro no. %M). Se você não estiver sem memória disponível, você pode consultar o manual sobre um possível 'bug' dependente do sistema operacional"
+        rum "Nu pot crea un thread nou (Eroare %M). Daca mai aveti memorie disponibila in sistem, puteti consulta manualul - ar putea exista un potential bug in legatura cu sistemul de operare"
+        rus "Невозможно создать новый поток (ошибка %M). Если это не ситуация, связанная с нехваткой памяти, то вам следует изучить документацию на предмет описания возможной ошибки работы в конкретной ОС"
+        serbian "Ne mogu da kreiram novi thread (errno %M). Ako imate još slobodne memorije, trebali biste da pogledate u priručniku da li je ovo specifična greška vašeg operativnog sistema"
+        spa "No puedo crear un nuevo thread (errno %M). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO"
+        swe "Kan inte skapa en ny tråd (errno %M)"
+        ukr "Не можу створити нову гілку (помилка %M). Якщо ви не використали усю пам'ять, то прочитайте документацію до вашої ОС - можливо це помилка ОС"
 ER_WRONG_VALUE_COUNT_ON_ROW 21S01 
         cze "Po-Bčet sloupců neodpovídá počtu hodnot na řádku %lu"
         dan "Kolonne antallet stemmer ikke overens med antallet af værdier i post %lu"
@@ -3288,45 +3288,45 @@ ER_NONEXISTING_GRANT 42000
         swe "Det finns inget privilegium definierat för användare '%-.48s' på '%-.64s'"
         ukr "Повноважень не визначено для користувача '%-.48s' з хосту '%-.64s'"
 ER_TABLEACCESS_DENIED_ERROR 42000 
-        cze "%-.16s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro tabulku '%-.192s'"
-        dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for tabellen '%-.192s'"
-        nla "%-.16s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor tabel '%-.192s'"
-        eng "%-.16s command denied to user '%-.48s'@'%-.64s' for table '%-.192s'"
-        jps "コマンド %-.16s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.192s' に対して許可されていません",
-        est "%-.16s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tabelis '%-.192s'"
-        fre "La commande '%-.16s' est interdite à l'utilisateur: '%-.48s'@'@%-.64s' sur la table '%-.192s'"
-        ger "%-.16s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' auf Tabelle '%-.192s'"
-        hun "%-.16s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.192s' tablaban"
-        ita "Comando %-.16s negato per l'utente: '%-.48s'@'%-.64s' sulla tabella '%-.192s'"
-        jpn "コマンド %-.16s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.192s' に対して許可されていません"
-        kor "'%-.16s' 명령은 다음 사용자에게 거부되었습니다. : '%-.48s'@'%-.64s' for 테이블 '%-.192s'"
-        por "Comando '%-.16s' negado para o usuário '%-.48s'@'%-.64s' na tabela '%-.192s'"
-        rum "Comanda %-.16s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru tabela '%-.192s'"
-        rus "Команда %-.16s запрещена пользователю '%-.48s'@'%-.64s' для таблицы '%-.192s'"
-        serbian "%-.16s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za tabelu '%-.192s'"
-        spa "%-.16s comando negado para usuario: '%-.48s'@'%-.64s' para tabla '%-.192s'"
-        swe "%-.16s ej tillåtet för '%-.48s'@'%-.64s' för tabell '%-.192s'"
-        ukr "%-.16s команда заборонена користувачу: '%-.48s'@'%-.64s' у таблиці '%-.192s'"
+        cze "%-.32s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro tabulku '%-.192s'"
+        dan "%-.32s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for tabellen '%-.192s'"
+        nla "%-.32s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor tabel '%-.192s'"
+        eng "%-.32s command denied to user '%-.48s'@'%-.64s' for table '%-.192s'"
+        jps "コマンド %-.32s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.192s' に対して許可されていません",
+        est "%-.32s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tabelis '%-.192s'"
+        fre "La commande '%-.32s' est interdite à l'utilisateur: '%-.48s'@'@%-.64s' sur la table '%-.192s'"
+        ger "%-.32s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' auf Tabelle '%-.192s'"
+        hun "%-.32s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.192s' tablaban"
+        ita "Comando %-.32s negato per l'utente: '%-.48s'@'%-.64s' sulla tabella '%-.192s'"
+        jpn "コマンド %-.32s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.192s' に対して許可されていません"
+        kor "'%-.32s' 명령은 다음 사용자에게 거부되었습니다. : '%-.48s'@'%-.64s' for 테이블 '%-.192s'"
+        por "Comando '%-.32s' negado para o usuário '%-.48s'@'%-.64s' na tabela '%-.192s'"
+        rum "Comanda %-.32s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru tabela '%-.192s'"
+        rus "Команда %-.32s запрещена пользователю '%-.48s'@'%-.64s' для таблицы '%-.192s'"
+        serbian "%-.32s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za tabelu '%-.192s'"
+        spa "%-.32s comando negado para usuario: '%-.48s'@'%-.64s' para tabla '%-.192s'"
+        swe "%-.32s ej tillåtet för '%-.48s'@'%-.64s' för tabell '%-.192s'"
+        ukr "%-.32s команда заборонена користувачу: '%-.48s'@'%-.64s' у таблиці '%-.192s'"
 ER_COLUMNACCESS_DENIED_ERROR 42000 
-        cze "%-.16s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro sloupec '%-.192s' v tabulce '%-.192s'"
-        dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for kolonne '%-.192s' in tabellen '%-.192s'"
-        nla "%-.16s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor kolom '%-.192s' in tabel '%-.192s'"
-        eng "%-.16s command denied to user '%-.48s'@'%-.64s' for column '%-.192s' in table '%-.192s'"
-        jps "コマンド %-.16s は ユーザー '%-.48s'@'%-.64s'¥n カラム '%-.192s' テーブル '%-.192s' に対して許可されていません",
-        est "%-.16s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tulbale '%-.192s' tabelis '%-.192s'"
-        fre "La commande '%-.16s' est interdite à l'utilisateur: '%-.48s'@'@%-.64s' sur la colonne '%-.192s' de la table '%-.192s'"
-        ger "%-.16s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' und Feld '%-.192s' in Tabelle '%-.192s'"
-        hun "%-.16s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.192s' mezo eseten a '%-.192s' tablaban"
-        ita "Comando %-.16s negato per l'utente: '%-.48s'@'%-.64s' sulla colonna '%-.192s' della tabella '%-.192s'"
-        jpn "コマンド %-.16s は ユーザー '%-.48s'@'%-.64s'\n カラム '%-.192s' テーブル '%-.192s' に対して許可されていません"
-        kor "'%-.16s' 명령은 다음 사용자에게 거부되었습니다. : '%-.48s'@'%-.64s' for 칼럼 '%-.192s' in 테이블 '%-.192s'"
-        por "Comando '%-.16s' negado para o usuário '%-.48s'@'%-.64s' na coluna '%-.192s', na tabela '%-.192s'"
-        rum "Comanda %-.16s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru coloana '%-.192s' in tabela '%-.192s'"
-        rus "Команда %-.16s запрещена пользователю '%-.48s'@'%-.64s' для столбца '%-.192s' в таблице '%-.192s'"
-        serbian "%-.16s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za kolonu '%-.192s' iz tabele '%-.192s'"
-        spa "%-.16s comando negado para usuario: '%-.48s'@'%-.64s' para columna '%-.192s' en la tabla '%-.192s'"
-        swe "%-.16s ej tillåtet för '%-.48s'@'%-.64s' för kolumn '%-.192s' i tabell '%-.192s'"
-        ukr "%-.16s команда заборонена користувачу: '%-.48s'@'%-.64s' для стовбця '%-.192s' у таблиці '%-.192s'"
+        cze "%-.32s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro sloupec '%-.192s' v tabulce '%-.192s'"
+        dan "%-.32s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for kolonne '%-.192s' in tabellen '%-.192s'"
+        nla "%-.32s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor kolom '%-.192s' in tabel '%-.192s'"
+        eng "%-.32s command denied to user '%-.48s'@'%-.64s' for column '%-.192s' in table '%-.192s'"
+        jps "コマンド %-.32s は ユーザー '%-.48s'@'%-.64s'¥n カラム '%-.192s' テーブル '%-.192s' に対して許可されていません",
+        est "%-.32s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tulbale '%-.192s' tabelis '%-.192s'"
+        fre "La commande '%-.32s' est interdite à l'utilisateur: '%-.48s'@'@%-.64s' sur la colonne '%-.192s' de la table '%-.192s'"
+        ger "%-.32s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' und Feld '%-.192s' in Tabelle '%-.192s'"
+        hun "%-.32s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.192s' mezo eseten a '%-.192s' tablaban"
+        ita "Comando %-.32s negato per l'utente: '%-.48s'@'%-.64s' sulla colonna '%-.192s' della tabella '%-.192s'"
+        jpn "コマンド %-.32s は ユーザー '%-.48s'@'%-.64s'\n カラム '%-.192s' テーブル '%-.192s' に対して許可されていません"
+        kor "'%-.32s' 명령은 다음 사용자에게 거부되었습니다. : '%-.48s'@'%-.64s' for 칼럼 '%-.192s' in 테이블 '%-.192s'"
+        por "Comando '%-.32s' negado para o usuário '%-.48s'@'%-.64s' na coluna '%-.192s', na tabela '%-.192s'"
+        rum "Comanda %-.32s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru coloana '%-.192s' in tabela '%-.192s'"
+        rus "Команда %-.32s запрещена пользователю '%-.48s'@'%-.64s' для столбца '%-.192s' в таблице '%-.192s'"
+        serbian "%-.32s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za kolonu '%-.192s' iz tabele '%-.192s'"
+        spa "%-.32s comando negado para usuario: '%-.48s'@'%-.64s' para columna '%-.192s' en la tabla '%-.192s'"
+        swe "%-.32s ej tillåtet för '%-.48s'@'%-.64s' för kolumn '%-.192s' i tabell '%-.192s'"
+        ukr "%-.32s команда заборонена користувачу: '%-.48s'@'%-.64s' для стовбця '%-.192s' у таблиці '%-.192s'"
 ER_ILLEGAL_GRANT_FOR_TABLE 42000 
         cze "Neplatn-Bý příkaz GRANT/REVOKE. Prosím, přečtěte si v manuálu, jaká privilegia je možné použít."
         dan "Forkert GRANT/REVOKE kommando. Se i brugervejledningen hvilke privilegier der kan specificeres."
@@ -4010,69 +4010,69 @@ ER_CANT_DO_THIS_DURING_AN_TRANSACTION 25000
         swe "Du får inte utföra detta kommando i en transaktion"
         ukr "Вам не дозволено виконувати цю команду в транзакції"
 ER_ERROR_DURING_COMMIT  
-        cze "Chyba %d p-Bři COMMIT"
-        dan "Modtog fejl %d mens kommandoen COMMIT blev udført"
-        nla "Kreeg fout %d tijdens COMMIT"
-        eng "Got error %d during COMMIT"
-        est "Viga %d käsu COMMIT täitmisel"
-        fre "Erreur %d lors du COMMIT"
-        ger "Fehler %d beim COMMIT"
-        hun "%d hiba a COMMIT vegrehajtasa soran"
-        ita "Rilevato l'errore %d durante il COMMIT"
-        por "Obteve erro %d durante COMMIT"
-        rus "Получена ошибка %d в процессе COMMIT"
-        serbian "Greška %d za vreme izvršavanja komande 'COMMIT'"
-        spa "Obtenido error %d durante COMMIT"
-        swe "Fick fel %d vid COMMIT"
-        ukr "Отримано помилку %d під час COMMIT"
+        cze "Chyba %M p-Bři COMMIT"
+        dan "Modtog fejl %M mens kommandoen COMMIT blev udført"
+        nla "Kreeg fout %M tijdens COMMIT"
+        eng "Got error %M during COMMIT"
+        est "Viga %M käsu COMMIT täitmisel"
+        fre "Erreur %M lors du COMMIT"
+        ger "Fehler %M beim COMMIT"
+        hun "%M hiba a COMMIT vegrehajtasa soran"
+        ita "Rilevato l'errore %M durante il COMMIT"
+        por "Obteve erro %M durante COMMIT"
+        rus "Получена ошибка %M в процессе COMMIT"
+        serbian "Greška %M za vreme izvršavanja komande 'COMMIT'"
+        spa "Obtenido error %M durante COMMIT"
+        swe "Fick fel %M vid COMMIT"
+        ukr "Отримано помилку %M під час COMMIT"
 ER_ERROR_DURING_ROLLBACK  
-        cze "Chyba %d p-Bři ROLLBACK"
-        dan "Modtog fejl %d mens kommandoen ROLLBACK blev udført"
-        nla "Kreeg fout %d tijdens ROLLBACK"
-        eng "Got error %d during ROLLBACK"
-        est "Viga %d käsu ROLLBACK täitmisel"
-        fre "Erreur %d lors du ROLLBACK"
-        ger "Fehler %d beim ROLLBACK"
-        hun "%d hiba a ROLLBACK vegrehajtasa soran"
-        ita "Rilevato l'errore %d durante il ROLLBACK"
-        por "Obteve erro %d durante ROLLBACK"
-        rus "Получена ошибка %d в процессе ROLLBACK"
-        serbian "Greška %d za vreme izvršavanja komande 'ROLLBACK'"
-        spa "Obtenido error %d durante ROLLBACK"
-        swe "Fick fel %d vid ROLLBACK"
-        ukr "Отримано помилку %d під час ROLLBACK"
+        cze "Chyba %M p-Bři ROLLBACK"
+        dan "Modtog fejl %M mens kommandoen ROLLBACK blev udført"
+        nla "Kreeg fout %M tijdens ROLLBACK"
+        eng "Got error %M during ROLLBACK"
+        est "Viga %M käsu ROLLBACK täitmisel"
+        fre "Erreur %M lors du ROLLBACK"
+        ger "Fehler %M beim ROLLBACK"
+        hun "%M hiba a ROLLBACK vegrehajtasa soran"
+        ita "Rilevato l'errore %M durante il ROLLBACK"
+        por "Obteve erro %M durante ROLLBACK"
+        rus "Получена ошибка %M в процессе ROLLBACK"
+        serbian "Greška %M za vreme izvršavanja komande 'ROLLBACK'"
+        spa "Obtenido error %M durante ROLLBACK"
+        swe "Fick fel %M vid ROLLBACK"
+        ukr "Отримано помилку %M під час ROLLBACK"
 ER_ERROR_DURING_FLUSH_LOGS  
-        cze "Chyba %d p-Bři FLUSH_LOGS"
-        dan "Modtog fejl %d mens kommandoen FLUSH_LOGS blev udført"
-        nla "Kreeg fout %d tijdens FLUSH_LOGS"
-        eng "Got error %d during FLUSH_LOGS"
-        est "Viga %d käsu FLUSH_LOGS täitmisel"
-        fre "Erreur %d lors du FLUSH_LOGS"
-        ger "Fehler %d bei FLUSH_LOGS"
-        hun "%d hiba a FLUSH_LOGS vegrehajtasa soran"
-        ita "Rilevato l'errore %d durante il FLUSH_LOGS"
-        por "Obteve erro %d durante FLUSH_LOGS"
-        rus "Получена ошибка %d в процессе FLUSH_LOGS"
-        serbian "Greška %d za vreme izvršavanja komande 'FLUSH_LOGS'"
-        spa "Obtenido error %d durante FLUSH_LOGS"
-        swe "Fick fel %d vid FLUSH_LOGS"
-        ukr "Отримано помилку %d під час FLUSH_LOGS"
+        cze "Chyba %M p-Bři FLUSH_LOGS"
+        dan "Modtog fejl %M mens kommandoen FLUSH_LOGS blev udført"
+        nla "Kreeg fout %M tijdens FLUSH_LOGS"
+        eng "Got error %M during FLUSH_LOGS"
+        est "Viga %M käsu FLUSH_LOGS täitmisel"
+        fre "Erreur %M lors du FLUSH_LOGS"
+        ger "Fehler %M bei FLUSH_LOGS"
+        hun "%M hiba a FLUSH_LOGS vegrehajtasa soran"
+        ita "Rilevato l'errore %M durante il FLUSH_LOGS"
+        por "Obteve erro %M durante FLUSH_LOGS"
+        rus "Получена ошибка %M в процессе FLUSH_LOGS"
+        serbian "Greška %M za vreme izvršavanja komande 'FLUSH_LOGS'"
+        spa "Obtenido error %M durante FLUSH_LOGS"
+        swe "Fick fel %M vid FLUSH_LOGS"
+        ukr "Отримано помилку %M під час FLUSH_LOGS"
 ER_ERROR_DURING_CHECKPOINT  
-        cze "Chyba %d p-Bři CHECKPOINT"
-        dan "Modtog fejl %d mens kommandoen CHECKPOINT blev udført"
-        nla "Kreeg fout %d tijdens CHECKPOINT"
-        eng "Got error %d during CHECKPOINT"
-        est "Viga %d käsu CHECKPOINT täitmisel"
-        fre "Erreur %d lors du CHECKPOINT"
-        ger "Fehler %d bei CHECKPOINT"
-        hun "%d hiba a CHECKPOINT vegrehajtasa soran"
-        ita "Rilevato l'errore %d durante il CHECKPOINT"
-        por "Obteve erro %d durante CHECKPOINT"
-        rus "Получена ошибка %d в процессе CHECKPOINT"
-        serbian "Greška %d za vreme izvršavanja komande 'CHECKPOINT'"
-        spa "Obtenido error %d durante CHECKPOINT"
-        swe "Fick fel %d vid CHECKPOINT"
-        ukr "Отримано помилку %d під час CHECKPOINT"
+        cze "Chyba %M p-Bři CHECKPOINT"
+        dan "Modtog fejl %M mens kommandoen CHECKPOINT blev udført"
+        nla "Kreeg fout %M tijdens CHECKPOINT"
+        eng "Got error %M during CHECKPOINT"
+        est "Viga %M käsu CHECKPOINT täitmisel"
+        fre "Erreur %M lors du CHECKPOINT"
+        ger "Fehler %M bei CHECKPOINT"
+        hun "%M hiba a CHECKPOINT vegrehajtasa soran"
+        ita "Rilevato l'errore %M durante il CHECKPOINT"
+        por "Obteve erro %M durante CHECKPOINT"
+        rus "Получена ошибка %M в процессе CHECKPOINT"
+        serbian "Greška %M za vreme izvršavanja komande 'CHECKPOINT'"
+        spa "Obtenido error %M durante CHECKPOINT"
+        swe "Fick fel %M vid CHECKPOINT"
+        ukr "Отримано помилку %M під час CHECKPOINT"
 ER_NEW_ABORTING_CONNECTION 08S01 
         cze "Spojen-Bí %ld do databáze: '%-.192s' uživatel: '%-.48s' stroj: '%-.64s' (%-.64s) bylo přerušeno"
         dan "Afbrød forbindelsen %ld til databasen '%-.192s' bruger: '%-.48s' vært: '%-.64s' (%-.64s)"
@@ -5330,8 +5330,8 @@ ER_VIEW_CHECK_FAILED
         rus "проверка CHECK OPTION для VIEW '%-.192s.%-.192s' провалилась"
         ukr "Перевірка CHECK OPTION для VIEW '%-.192s.%-.192s' не пройшла"
 ER_PROCACCESS_DENIED_ERROR 42000 
-        eng "%-.16s command denied to user '%-.48s'@'%-.64s' for routine '%-.192s'"
-        ger "Befehl %-.16s nicht zulässig für Benutzer '%-.48s'@'%-.64s' in Routine '%-.192s'"
+        eng "%-.32s command denied to user '%-.48s'@'%-.64s' for routine '%-.192s'"
+        ger "Befehl %-.32s nicht zulässig für Benutzer '%-.48s'@'%-.64s' in Routine '%-.192s'"
 ER_RELAY_LOG_FAIL  
         eng "Failed purging old relay logs: %s"
         ger "Bereinigen alter Relais-Logs fehlgeschlagen: %s"
@@ -5384,8 +5384,8 @@ ER_LOGGING_PROHIBIT_CHANGING_OF
         eng "Binary logging and replication forbid changing the global server %s"
         ger "Binärlogs und Replikation verhindern Wechsel des globalen Servers %s"
 ER_NO_FILE_MAPPING  
-        eng "Can't map file: %-.200s, errno: %d"
-        ger "Kann Datei nicht abbilden: %-.200s, Fehler: %d"
+        eng "Can't map file: %-.200s, errno: %M"
+        ger "Kann Datei nicht abbilden: %-.200s, Fehler: %M"
 ER_WRONG_MAGIC  
         eng "Wrong magic in %-.64s"
         ger "Falsche magische Zahlen in %-.64s"
@@ -5547,8 +5547,8 @@ ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
         eng "Cannot drop default keycache"
         ger "Der vorgabemäßige Schlüssel-Cache kann nicht gelöscht werden"
 ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
-        eng "Display width out of range for '%-.192s' (max = %lu)"
-        ger "Anzeigebreite außerhalb des zulässigen Bereichs für '%-.192s' (Maximum: %lu)"
+        eng "Display width out of range for column '%-.192s' (max = %lu)"
+        ger "Anzeigebreite außerhalb des zulässigen Bereichs für Spalte '%-.192s' (Maximum: %lu)"
 ER_XAER_DUPID XAE08
         eng "XAER_DUPID: The XID already exists"
         ger "XAER_DUPID: Die XID existiert bereits"
@@ -5886,8 +5886,8 @@ ER_EVENT_ALREADY_EXISTS
         eng "Event '%-.192s' already exists"
         ger "Event '%-.192s' existiert bereits"
 ER_EVENT_STORE_FAILED
-        eng "Failed to store event %s. Error code %d from storage engine."
-        ger "Speichern von Event %s fehlgeschlagen. Fehlercode der Speicher-Engine: %d"
+        eng "Failed to store event %s. Error code %M from storage engine."
+        ger "Speichern von Event %s fehlgeschlagen. Fehlercode der Speicher-Engine: %M"
 ER_EVENT_DOES_NOT_EXIST
         eng "Unknown event '%-.192s'"
         ger "Unbekanntes Event '%-.192s'"
@@ -5991,8 +5991,8 @@ ER_EVENT_MODIFY_QUEUE_ERROR
         eng "Internal scheduler error %d"
         ger "Interner Scheduler-Fehler %d"
 ER_EVENT_SET_VAR_ERROR
-        eng "Error during starting/stopping of the scheduler. Error code %u"
-        ger "Fehler während des Startens oder Anhalten des Schedulers. Fehlercode %u"
+        eng "Error during starting/stopping of the scheduler. Error code %M"
+        ger "Fehler während des Startens oder Anhalten des Schedulers. Fehlercode %M"
 ER_PARTITION_MERGE_ERROR
         eng "Engine cannot be used in partitioned tables"
         ger "Engine kann in partitionierten Tabellen nicht verwendet werden"
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index ca434821800..c8cbab65985 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -687,7 +687,7 @@ static bool event_scheduler_update(sys_var *self, THD *thd, enum_var_type type)
             : Events::stop();
   mysql_mutex_lock(&LOCK_global_system_variables);
   if (ret)
-    my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), 0);
+    my_error(ER_EVENT_SET_VAR_ERROR, MYF(0), my_errno);
   return ret;
 }
 
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 64c37ca0537..7ace577130f 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -17,10 +17,14 @@
 #include "strings_def.h"
 #include <m_ctype.h>
 #include <stdarg.h>
+#include <my_sys.h>
+#include <my_base.h>
+#include <../mysys/my_handler_errors.h>
 
 
 #define MAX_ARGS 32                           /* max positional args count*/
 #define MAX_PRINT_INFO 32                     /* max print position count */
+#define MAX_WIDTH      65535
 
 #define LENGTH_ARG     1
 #define WIDTH_ARG      2
@@ -65,6 +69,7 @@ struct print_info
 
 static const char *get_length(const char *fmt, size_t *length, uint *pre_zero)
 {
+  
   for (; my_isdigit(&my_charset_latin1, *fmt); fmt++)
   {
     *length= *length * 10 + (uint)(*fmt - '0');
@@ -75,23 +80,27 @@ static const char *get_length(const char *fmt, size_t *length, uint *pre_zero)
 }
 
 
-/**
-  Calculates print width or index of positional argument
+/*
+  Get argument for '*' parameter
 
   @param fmt         processed string
-  @param width       print width or index of positional argument
+  @param args_arr    Arguments to printf
+  @param arg_count   Number of arguments to printf
+  @param length      returns length of argument
+  @param flag        returns flags with PREZERO_ARG set if necessary
 
-  @retval
-    string position right after width digits
+  @return new fmt
 */
 
-static const char *get_width(const char *fmt, size_t *width)
+static const char *get_length_arg(const char *fmt, ARGS_INFO *args_arr,
+                                  uint *arg_count, size_t *length, uint *flags)
 {
-  for (; my_isdigit(&my_charset_latin1, *fmt); fmt++)
-  {
-    *width= *width * 10 + (uint)(*fmt - '0');
-  }
-  return fmt;
+  fmt= get_length(fmt+1, length, flags);
+  *arg_count= max(*arg_count, (uint) *length);
+  (*length)--;    
+  DBUG_ASSERT(*fmt == '$' && *length < MAX_ARGS);
+  args_arr[*length].arg_type= 'd';
+  return fmt+1;
 }
 
 /**
@@ -123,6 +132,8 @@ static const char *check_longlong(const char *fmt, uint *have_longlong)
     fmt++;
     *have_longlong= (sizeof(size_t) == sizeof(longlong));
   }
+  if (*fmt == 'p')
+    *have_longlong= (sizeof(void *) == sizeof(longlong));
   return fmt;
 }
 
@@ -227,7 +238,7 @@ static char *process_bin_arg(char *to, char *end, size_t width, char *par)
 static char *process_dbl_arg(char *to, char *end, size_t width,
                              double par, char arg_type)
 {
-  if (width == SIZE_T_MAX)
+  if (width == MAX_WIDTH)
     width= FLT_DIG; /* width not set, use default */
   else if (width >= NOT_FIXED_DEC)
     width= NOT_FIXED_DEC - 1; /* max.precision for my_fcvt() */
@@ -338,42 +349,31 @@ start:
   /* Get print length */
   if (*fmt == '*')
   {          
-    fmt++;
-    fmt= get_length(fmt, &print_arr[idx].length, &print_arr[idx].flags);
-    print_arr[idx].length--;    
-    DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
-    args_arr[print_arr[idx].length].arg_type= 'd';
+    fmt= get_length_arg(fmt, args_arr, &arg_count, &print_arr[idx].length,
+                        &print_arr[idx].flags);
     print_arr[idx].flags|= LENGTH_ARG;
-    arg_count= max(arg_count, print_arr[idx].length + 1);
-    fmt++;
   }
   else
     fmt= get_length(fmt, &print_arr[idx].length, &print_arr[idx].flags);
   
   if (*fmt == '.')
   {
+    uint flags= 0;
     fmt++;
     /* Get print width */
     if (*fmt == '*')
     {
-      fmt++;
-      fmt= get_width(fmt, &print_arr[idx].width);
-      print_arr[idx].width--;
-      DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
-      args_arr[print_arr[idx].width].arg_type= 'd';
+      fmt= get_length_arg(fmt, args_arr, &arg_count, &print_arr[idx].width,
+                          &flags);
       print_arr[idx].flags|= WIDTH_ARG;
-      arg_count= max(arg_count, print_arr[idx].width + 1);
-      fmt++;
     }
     else
-      fmt= get_width(fmt, &print_arr[idx].width);
+      fmt= get_length(fmt, &print_arr[idx].width, &flags);
   }
   else
-    print_arr[idx].width= SIZE_T_MAX;
+    print_arr[idx].width= MAX_WIDTH;
 
   fmt= check_longlong(fmt, &args_arr[arg_index].have_longlong);
-  if (*fmt == 'p')
-    args_arr[arg_index].have_longlong= (sizeof(void *) == sizeof(longlong));
   args_arr[arg_index].arg_type= print_arr[idx].arg_type= *fmt;
   
   print_arr[idx].arg_idx= arg_index;
@@ -412,6 +412,7 @@ start:
         else
           args_arr[i].longlong_arg= va_arg(ap, uint);
         break;
+      case 'M':
       case 'c':
         args_arr[i].longlong_arg= va_arg(ap, int);
         break;
@@ -472,17 +473,34 @@ start:
           ? (size_t)args_arr[print_arr[i].length].longlong_arg
           : print_arr[i].length;
 
-        if (args_arr[print_arr[i].arg_idx].have_longlong)
-          larg = args_arr[print_arr[i].arg_idx].longlong_arg;
-        else if (print_arr[i].arg_type == 'd' || print_arr[i].arg_type == 'i' )
-          larg = (int) args_arr[print_arr[i].arg_idx].longlong_arg;
-        else
-          larg= (uint) args_arr[print_arr[i].arg_idx].longlong_arg;
-
+        larg = args_arr[print_arr[i].arg_idx].longlong_arg;
         to= process_int_arg(to, end, length, larg, print_arr[i].arg_type,
                             print_arr[i].flags);
         break;
       }
+      case 'M':
+      {
+        longlong larg;
+        char *org_to= to;
+        char errmsg_buff[MYSYS_STRERROR_SIZE];
+
+        length= (print_arr[i].flags & WIDTH_ARG)
+          ? (size_t)args_arr[print_arr[i].width].longlong_arg
+          : print_arr[i].width;
+
+        larg = args_arr[print_arr[i].arg_idx].longlong_arg;
+        to= process_int_arg(to, end, 0, larg, 'd', print_arr[i].flags);
+        width-= (to - org_to);
+        if (width <= 4)
+          break;
+        *to++= ' ';
+        *to++= '-';
+        *to++= ' ';
+        my_strerror(errmsg_buff, sizeof(errmsg_buff), (int) larg);
+        to= process_str_arg(cs, to, end, width, errmsg_buff,
+                            print_arr[i].flags);
+        break;
+      }
       default:
         break;
       }
@@ -490,6 +508,7 @@ start:
       if (to == end)
         break;
 
+      /* Copy data after the % format expression until next % */
       length= min(end - to , print_arr[i].end - print_arr[i].begin);
       if (to + length < end)
         length++;
@@ -501,13 +520,14 @@ start:
   }
   else
   {
+    uint flags= 0;
     /* Process next positional argument*/
     DBUG_ASSERT(*fmt == '%');
     print_arr[idx].end= fmt - 1;
     idx++;
     fmt++;
     arg_index= 0;
-    fmt= get_width(fmt, &arg_index);
+    fmt= get_length(fmt, &arg_index, &flags);
     DBUG_ASSERT(*fmt == '$');
     fmt++;
     arg_count= max(arg_count, arg_index);
@@ -585,6 +605,7 @@ size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,
 
     if (*fmt == '.')
     {
+      uint flags= 0;
       fmt++;
       if (*fmt == '*')
       {
@@ -592,10 +613,10 @@ size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,
         width= va_arg(ap, int);
       }
       else
-        fmt= get_width(fmt, &width);
+        fmt= get_length(fmt, &width, &flags);
     }
     else
-      width= SIZE_T_MAX;   
+      width= MAX_WIDTH;
 
     fmt= check_longlong(fmt, &have_longlong);
 
@@ -622,8 +643,6 @@ size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,
     {
       /* Integer parameter */
       longlong larg;
-      if (*fmt == 'p')
-        have_longlong= (sizeof(void *) == sizeof(longlong));
 
       if (have_longlong)
         larg = va_arg(ap,longlong);
@@ -644,6 +663,24 @@ size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n,
       *to++= (char) larg;
       continue;
     }
+    else if (*fmt == 'M')
+    {
+      const char *org_to= to;
+      int larg= va_arg(ap, int);
+      to= process_int_arg(to, end, 0, larg, 'd', print_type);
+      width-= (to - org_to);
+      if ((end - to) >= 4 && (int) width >= 4)
+      {
+        char errmsg_buff[MYSYS_STRERROR_SIZE];
+        *to++= ' ';
+        *to++= '-';
+        *to++= ' ';
+        width-= 3;
+        my_strerror(errmsg_buff, sizeof(errmsg_buff), larg);
+        to= process_str_arg(cs, to, end, width, errmsg_buff, print_type);     
+      }
+      continue;
+    }
 
     /* We come here on '%%', unknown code or too long parameter */
     if (to == end)
@@ -697,3 +734,67 @@ int my_vfprintf(FILE *stream, const char* format, va_list args)
   (void) my_vsnprintf(cvtbuf, sizeof(cvtbuf), format, args);
   return fprintf(stream, "%s\n", cvtbuf);
 }
+
+
+/*
+  Return system error text for given error number
+
+  @param buf        Buffer (of size MYSYS_STRERROR_SIZE)
+  @param len        Length of buffer
+  @param nr         Error number
+*/
+
+void my_strerror(char *buf, size_t len, int nr)
+{
+  char *msg= NULL;
+
+  buf[0]= '\0';                                  /* failsafe */
+
+  if (nr <= 0)
+  {
+    strmake(buf, (nr == 0 ?
+                  "Internal error/check (Not system error)" :
+                  "Internal error < 0 (Not system error)"),
+            len-1);
+    return;
+  }
+
+  /*
+    These (handler-) error messages are shared by perror, as required
+    by the principle of least surprise.
+  */
+  if ((nr >= HA_ERR_FIRST) && (nr <= HA_ERR_LAST))
+  {
+    msg= (char *) handler_error_messages[nr - HA_ERR_FIRST];
+    strmake(buf, msg, len - 1);
+  }
+  else
+  {
+    /*
+      On Windows, do things the Windows way. On a system that supports both
+      the GNU and the XSI variant, use whichever was configured (GNU); if
+      this choice is not advertised, use the default (POSIX/XSI).  Testing
+      for __GNUC__ is not sufficient to determine whether this choice exists.
+    */
+#if defined(__WIN__)
+    strerror_s(buf, len, nr);
+#elif ((defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE >= 200112L)) ||    \
+       (defined _XOPEN_SOURCE   && (_XOPEN_SOURCE >= 600)))      &&    \
+      ! defined _GNU_SOURCE
+    strerror_r(nr, buf, len);             /* I can build with or without GNU */
+#elif defined _GNU_SOURCE
+    char *r= strerror_r(nr, buf, len);
+    if (r != buf)                         /* Want to help, GNU? */
+      strmake(buf, r, len - 1);           /* Then don't. */
+#else
+    strerror_r(nr, buf, len);
+#endif
+  }
+
+  /*
+    strerror() return values are implementation-dependent, so let's
+    be pragmatic.
+  */
+  if (!buf[0])
+    strmake(buf, "unknown error", len - 1);
+}
diff --git a/unittest/mysys/my_vsnprintf-t.c b/unittest/mysys/my_vsnprintf-t.c
index 06f6878826a..3131068b4c3 100644
--- a/unittest/mysys/my_vsnprintf-t.c
+++ b/unittest/mysys/my_vsnprintf-t.c
@@ -31,7 +31,7 @@ void test1(const char *res, const char *fmt, ...)
 
 int main(void)
 {
-  plan(58);
+  plan(59);
 
   test1("Constant string",
         "Constant string");
@@ -177,6 +177,8 @@ int main(void)
   test1("My `DDDD` test CCCC, `DDD`",
         "My %1$`s test %2$s, %1$`-.3s", "DDDD", "CCCC");
 
+  test1("Error 1 - Operation not permitted", "Error %M", 1);
+
   return exit_status();
 }
author	Michael Widenius <monty@askmonty.org>	2012-05-30 00:37:55 +0300
committer	Michael Widenius <monty@askmonty.org>	2012-05-30 00:37:55 +0300
commit	aa81e025a88d13c5040bb3fe808d70fd6d1e560c (patch)
tree	b4c742ede7e98215c740c143681d91ad53dce998
parent	3f4ef5928e72faf2b7fd0c98c8705ac649d2faf9 (diff)
download	mariadb-git-aa81e025a88d13c5040bb3fe808d70fd6d1e560c.tar.gz