Language/consistency edits to error messages

and affected test results.

mysql-test/r/alter_table.result

@@ -121,7 +121,7 @@ create database mysqltest;
 create table mysqltest.t1 (a int,b int,c int);
 grant all on mysqltest.t1 to mysqltest_1@localhost;
 alter table t1 rename t2;
-ERROR 42000: insert command denied to user: 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: insert command denied to user 'mysqltest_1'@'localhost' for table 't2'
 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 delete from mysql.user where user='mysqltest_1';
 drop database mysqltest;

mysql-test/r/auto_increment.result

@@ -162,7 +162,7 @@ last_insert_id()
 255
 insert into t1 set i = null;
 Warnings:
-Warning	1264	Data truncated, out of range for column 'i' at row 1
+Warning	1264	Data truncated; out of range for column 'i' at row 1
 select last_insert_id();
 last_insert_id()
 255
@@ -213,7 +213,7 @@ a	b
 delete from t1 where a=0;
 update t1 set a=NULL where b=6;
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 4
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 4
 update t1 set a=300 where b=7;
 SET SQL_MODE='';
 insert into t1(a,b)values(NULL,8);
@@ -255,7 +255,7 @@ a	b
 delete from t1 where a=0;
 update t1 set a=NULL where b=13;
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 9
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 9
 update t1 set a=500 where b=14;
 select * from t1 order by b;
 a	b

mysql-test/r/create.result

@@ -11,7 +11,7 @@ create table t1 (b char(0) not null);
 create table if not exists t1 (b char(0) not null);
 insert into t1 values (""),(null);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'b' at row 2
 select * from t1;
 b
 
@@ -47,7 +47,7 @@ ERROR 42000: Identifier name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 create table test (a datetime default now());
 ERROR 42000: Invalid default value for 'a'
 create table test (a datetime on update now());
-ERROR HY000: Invalid ON UPDATE clause for 'a' field
+ERROR HY000: Invalid ON UPDATE clause for 'a' column
 create table test (a int default 100 auto_increment);
 ERROR 42000: Invalid default value for 'a'
 create table 1ea10 (1a20 int,1e int);
@@ -275,11 +275,11 @@ ERROR 42000: Incorrect database name 'db1 '
 create table t1(`a ` int);
 ERROR 42000: Incorrect column name 'a '
 create table t1 (a int,);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1
 create table t1 (a int,,b int);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
 create table t1 (,b int);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'b int)' at line 1
 create table t1 (a int, key(a));
 create table t2 (b int, foreign key(b) references t1(a), key(b));
 drop table if exists t1,t2;

mysql-test/r/derived.result

@@ -211,15 +211,15 @@ a
 2
 drop table t1;
 select mail_id,  if(folder.f_description!='', folder.f_description, folder.f_name) as folder_name,  date, address_id, phrase, address,  subject from folder, (select  mail.mail_id as mail_id,  date_format(mail.h_date, '%b %e, %Y %h:%i') as date,  mail.folder_id,  sender.address_id as address_id,  sender.phrase as phrase, sender.address as address,    mail.h_subject as subject from    mail left join mxa as mxa_sender on mail.mail_id=mxa_sender.mail_id and mxa_sender.type='from' left join address as sender on mxa_sender.address_id=sender.address_id  mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_recipient.mail_id   and mxa_recipient.address_id=recipient.address_id   and mxa_recipient.type='to'  and  match(sender.phrase, sender.address, sender.comment) against ('jeremy' in boolean mode)   and  match(recipient.phrase, recipient.address, recipient.comment) against ('monty' in boolean mode) order by mail.h_date desc limit 0, 25 ) as query where query.folder_id=folder.folder_id;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_r' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_r' at line 1
 create table t1 (a int);
 insert into t1 values (1),(2),(3);
 update (select * from t1) as t1 set a = 5;
 ERROR HY000: The target table t1 of the UPDATE is not updatable
 delete from (select * from t1);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1)' at line 1
 insert into  (select * from t1) values (5);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1) values (5)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '(select * from t1) values (5)' at line 1
 drop table t1;
 create table t1 (E1 INTEGER UNSIGNED NOT NULL, E2 INTEGER UNSIGNED NOT NULL, E3 INTEGER UNSIGNED NOT NULL, PRIMARY KEY(E1)
 );

mysql-test/r/grant2.result

@@ -10,7 +10,7 @@ current_user
 mysqltest_1@localhost
 grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
 grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
-ERROR 42000: Access denied for user: 'mysqltest_1'@'localhost' to database 'my_%'
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'my_%'
 show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'

mysql-test/r/grant_cache.result

@@ -134,7 +134,7 @@ a	b	c	a
 1	1	1	test.t1
 2	2	2	test.t1
 select * from t2;
-ERROR 42000: select command denied to user: 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: select command denied to user 'mysqltest_2'@'localhost' for table 't2'
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	6
@@ -148,17 +148,17 @@ select "user3";
 user3
 user3
 select * from t1;
-ERROR 42000: select command denied to user: 'mysqltest_3'@'localhost' for column 'b' in table 't1'
+ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for column 'b' in table 't1'
 select a from t1;
 a
 1
 2
 select c from t1;
-ERROR 42000: SELECT command denied to user: 'mysqltest_3'@'localhost' for column 'c' in table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
 select * from t2;
-ERROR 42000: select command denied to user: 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for table 't2'
 select mysqltest.t1.c from test.t1,mysqltest.t1;
-ERROR 42000: SELECT command denied to user: 'mysqltest_3'@'localhost' for column 'c' in table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	6

mysql-test/r/handler.result

@@ -6,7 +6,7 @@ insert into t1 values
 (20,"ggg"),(21,"hhh"),(22,"iii");
 handler t1 open as t2;
 handler t2 read a=(SELECT 1);
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1
 handler t2 read a first;
 a	b
 14	aaa
@@ -135,7 +135,7 @@ handler t2 read next;
 a	b
 19	fff
 handler t2 read last;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 handler t2 close;
 handler t1 open as t2;
 drop table t1;

mysql-test/r/innodb_handler.result

@@ -130,7 +130,7 @@ handler t2 read next;
 a	b
 18	eee
 handler t2 read last;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 handler t2 close;
 handler t1 open as t2;
 handler t2 read first;

mysql-test/r/insert.result

@@ -63,7 +63,7 @@ insert into t1 values(NULL);
 ERROR 23000: Column 'id' cannot be null
 insert into t1 values (1), (NULL), (2);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'id' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'id' at row 2
 select * from t1;
 id
 1
@@ -159,18 +159,18 @@ insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@val
 Warnings:
 Warning	1265	Data truncated for column 'f_double' at row 1
 Warning	1265	Data truncated for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
 Warning	1265	Data truncated for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
 Warning	1265	Data truncated for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
 Warning	1265	Data truncated for column 'f_double_u' at row 1
 Warning	1265	Data truncated for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
 Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
 Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	4
 original_value	1e+1111111111a
@@ -187,19 +187,19 @@ insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@val
 Warnings:
 Warning	1265	Data truncated for column 'f_double' at row 1
 Warning	1265	Data truncated for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
 Warning	1265	Data truncated for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
 Warning	1265	Data truncated for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
 Warning	1265	Data truncated for column 'f_double_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_u' at row 1
 Warning	1265	Data truncated for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
 Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
 Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	5
 original_value	-1e+1111111111a
@@ -214,12 +214,12 @@ f_float_3_1_u	0.0
 set @value= 1e+1111111111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	6
 original_value	1.7976931348623e+308
@@ -234,13 +234,13 @@ f_float_3_1_u	99.9
 set @value= -1e+1111111111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	7
 original_value	-1.7976931348623e+308
@@ -255,12 +255,12 @@ f_float_3_1_u	0.0
 set @value= 1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	8
 original_value	1e+111
@@ -275,13 +275,13 @@ f_float_3_1_u	99.9
 set @value= -1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_7_2' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_4_3' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	9
 original_value	-1e+111
@@ -309,10 +309,10 @@ f_float_3_1_u	1.0
 set @value= -1;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_double_15_1_u' at row 1
-Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated; out of range for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	11
 original_value	-1

mysql-test/r/insert_select.result

@@ -622,8 +622,8 @@ NULL	2	100
 create table t2(No int not null, Field int not null, Count int not null);
 insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'No' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'No' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'No' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'No' at row 2
 select * from t2;
 No	Field	Count
 0	1	100

mysql-test/r/join.result

@@ -126,7 +126,7 @@ a
 1
 2
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
-ERROR HY000: Too many tables. MySQL can only use XX tables in a join
+ERROR HY000: Too many tables; MySQL can only use XX tables in a join
 drop table t1;
 CREATE TABLE t1 (
 a int(11) NOT NULL,

mysql-test/r/join_outer.result

@@ -106,11 +106,11 @@ grp	a	c	id	a	c	d	a
 3	6	D	3	6	C	6	6
 NULL	NULL		NULL	NULL	NULL	NULL	NULL
 explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42000: Cross dependency found in OUTER JOIN.  Examine your ON conditions
+ERROR 42000: Cross dependency found in OUTER JOIN; examine your ON conditions
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
-ERROR 42000: Cross dependency found in OUTER JOIN.  Examine your ON conditions
+ERROR 42000: Cross dependency found in OUTER JOIN; examine your ON conditions
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t2.a=t3.a);
-ERROR 42000: Cross dependency found in OUTER JOIN.  Examine your ON conditions
+ERROR 42000: Cross dependency found in OUTER JOIN; examine your ON conditions
 select t1.*,t2.* from t1 inner join t2 using (a);
 grp	a	c	id	a	c	d
 1	1	a	1	1	a	1
@@ -406,7 +406,7 @@ insert into t3 values (1);
 insert into t4 values (1,1);
 insert into t5 values (1,1);
 explain select * from t3 left join t4 on t4.seq_1_id = t2.t2_id left join t1 on t1.t1_id = t4.seq_0_id left join t5 on t5.seq_0_id = t1.t1_id left join t2 on t2.t2_id = t5.seq_1_id where t3.t3_id = 23;
-ERROR 42000: Cross dependency found in OUTER JOIN.  Examine your ON conditions
+ERROR 42000: Cross dependency found in OUTER JOIN; examine your ON conditions
 drop table t1,t2,t3,t4,t5;
 create table t1 (n int, m int, o int, key(n));
 create table t2 (n int not null, m int, o int, primary key(n));

mysql-test/r/key.result

@@ -156,8 +156,8 @@ CREATE TABLE t1 (c CHAR(10) NOT NULL,i INT NOT NULL AUTO_INCREMENT,
 UNIQUE (c,i));
 INSERT INTO t1 (c) VALUES (NULL),(NULL);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'c' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'c' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'c' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'c' at row 2
 SELECT * FROM t1;
 c	i
 	1

mysql-test/r/key_cache.result

@@ -39,9 +39,9 @@ SELECT @@medium.key_buffer_size;
 0
 SET @@global.key_buffer_size=@save_key_buffer;
 SELECT @@default.key_buffer_size;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'default.key_buffer_size' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'default.key_buffer_size' at line 1
 SELECT @@skr.storage_engine="test";
-ERROR HY000: Variable 'storage_engine' is not a variable component (Can't be used as XXXX.variable_name)
+ERROR HY000: Variable 'storage_engine' is not a variable component (can't be used as XXXX.variable_name)
 select @@keycache1.key_cache_block_size;
 @@keycache1.key_cache_block_size
 0

mysql-test/r/multi_update.result

@@ -191,7 +191,7 @@ n	d	unix_timestamp(t)
 1	10	1038401397
 2	20	1038401397
 UPDATE t1,t2 SET 1=2 WHERE t1.n=t2.n;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1=2 WHERE t1.n=t2.n' at line 1
 drop table t1,t2;
 set timestamp=0;
 set sql_safe_updates=0;

mysql-test/r/ndb_replace.result

@@ -11,7 +11,7 @@ insert into t1 (gesuchnr, benutzer_id) value (3,2);
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 insert into t1 (gesuchnr,benutzer_id) values (1,1);
-ERROR 23000: Can't write, duplicate key in table 't1'
+ERROR 23000: Can't write; duplicate key in table 't1'
 replace into t1 (gesuchnr,benutzer_id) values (1,1);
 select * from t1 order by gesuchnr;
 gesuchnr	benutzer_id

mysql-test/r/null.result

@@ -97,39 +97,39 @@ Warnings:
 Warning	1265	Data truncated for column 'd' at row 1
 UPDATE t1 SET d=NULL;
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'd' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'd' at row 1
 INSERT INTO t1 (a) values (null);
 ERROR 23000: Column 'a' cannot be null
 INSERT INTO t1 (a) values (1/null);
 ERROR 23000: Column 'a' cannot be null
 INSERT INTO t1 (a) values (null),(null);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 2
 INSERT INTO t1 (b) values (null);
 ERROR 23000: Column 'b' cannot be null
 INSERT INTO t1 (b) values (1/null);
 ERROR 23000: Column 'b' cannot be null
 INSERT INTO t1 (b) values (null),(null);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'b' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'b' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'b' at row 2
 INSERT INTO t1 (c) values (null);
 ERROR 23000: Column 'c' cannot be null
 INSERT INTO t1 (c) values (1/null);
 ERROR 23000: Column 'c' cannot be null
 INSERT INTO t1 (c) values (null),(null);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'c' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'c' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'c' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'c' at row 2
 INSERT INTO t1 (d) values (null);
 ERROR 23000: Column 'd' cannot be null
 INSERT INTO t1 (d) values (1/null);
 ERROR 23000: Column 'd' cannot be null
 INSERT INTO t1 (d) values (null),(null);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'd' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'd' at row 1
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'd' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'd' at row 2
 select * from t1;
 a	b	c	d
 	0	0000-00-00 00:00:00	0

mysql-test/r/null_key.result

@@ -337,7 +337,7 @@ index (id2)
 );
 insert into t1 values(null,null),(1,1);
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'id2' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'id2' at row 1
 select * from t1;
 id	id2
 NULL	0

mysql-test/r/openssl_1.result

@@ -10,22 +10,22 @@ select * from t1;
 f1
 5
 delete from t1;
-ERROR 42000: Access denied for user: 'ssl_user1'@'localhost' to database 'test'
+ERROR 42000: Access denied for user 'ssl_user1'@'localhost' to database 'test'
 select * from t1;
 f1
 5
 delete from t1;
-ERROR 42000: Access denied for user: 'ssl_user2'@'localhost' to database 'test'
+ERROR 42000: Access denied for user 'ssl_user2'@'localhost' to database 'test'
 select * from t1;
 f1
 5
 delete from t1;
-ERROR 42000: Access denied for user: 'ssl_user3'@'localhost' to database 'test'
+ERROR 42000: Access denied for user 'ssl_user3'@'localhost' to database 'test'
 select * from t1;
 f1
 5
 delete from t1;
-ERROR 42000: Access denied for user: 'ssl_user4'@'localhost' to database 'test'
+ERROR 42000: Access denied for user 'ssl_user4'@'localhost' to database 'test'
 delete from mysql.user where user='ssl_user%';
 delete from mysql.db where user='ssl_user%';
 flush privileges;

mysql-test/r/ps.result

@@ -25,11 +25,11 @@ ERROR HY000: Unknown prepared statement handler (no_such_statement) given to DEA
 execute stmt1;
 ERROR HY000: Incorrect arguments to EXECUTE
 prepare stmt2 from 'prepare nested_stmt from "select 1"';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '"select 1"' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"select 1"' at line 1
 prepare stmt2 from 'execute stmt1';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'stmt1' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'stmt1' at line 1
 prepare stmt2 from 'deallocate prepare z';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'z' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'z' at line 1
 prepare stmt3 from 'insert into t1 values (?,?)';
 set @arg1=5, @arg2='five';
 execute stmt3 using @arg1, @arg2;
@@ -84,11 +84,11 @@ NULL
 NULL
 NULL
 prepare stmt6 from 'select 1; select2';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1
 prepare stmt6 from 'insert into t1 values (5,"five"); select2';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1
 explain prepare stmt6 from 'insert into t1 values (5,"five"); select2';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'from 'insert into t1 values (5,"five"); select2'' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'from 'insert into t1 values (5,"five"); select2'' at line 1
 create table t2
 (
 a int
@@ -99,13 +99,13 @@ prepare stmt1 from 'select 1 FROM t2 where a=?' ;
 execute stmt1 using @arg00 ;
 1
 prepare stmt1 from @nosuchvar;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1
 set @ivar= 1234;
 prepare stmt1 from @ivar;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '1234' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '1234' at line 1
 set @fvar= 123.4567;
 prepare stmt1 from @fvar;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1
 set @str1 = 'select ?';
 set @str2 = convert(@str1 using ucs2);
 prepare stmt1 from @str2;

mysql-test/r/select_safe.result

@@ -30,7 +30,7 @@ ERROR HY000: You are using safe update mode and you tried to update a table with
 delete from t1 where a+0=1;
 ERROR HY000: You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column
 select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
-ERROR 42000: The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok
+ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay
 update t1 set b="a" limit 1;
 update t1 set b="a" where b="b" limit 2;
 delete from t1 where b="test" limit 1;
@@ -42,7 +42,7 @@ SELECT @@MAX_JOIN_SIZE, @@SQL_BIG_SELECTS;
 2	0
 insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a");
 SELECT * from t1 order by a;
-ERROR 42000: The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok
+ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay
 SET SQL_BIG_SELECTS=1;
 SELECT * from t1 order by a;
 a	b
@@ -52,7 +52,7 @@ a	b
 5	a
 SET MAX_JOIN_SIZE=2;
 SELECT * from t1;
-ERROR 42000: The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok
+ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay
 SET MAX_JOIN_SIZE=DEFAULT;
 SELECT * from t1;
 a	b

mysql-test/r/show_check.result

@@ -378,21 +378,21 @@ show create database test_$1;
 Database	Create Database
 test_$1	CREATE DATABASE `test_$1` /*!40100 DEFAULT CHARACTER SET latin1 */
 drop table t1;
-ERROR 42000: Access denied for user: 'mysqltest_1'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'test_$1'
 drop database test_$1;
-ERROR 42000: Access denied for user: 'mysqltest_1'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'test_$1'
 select * from test_$1.t1;
-ERROR 42000: Access denied for user: 'mysqltest_2'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'test_$1'
 show create database test_$1;
-ERROR 42000: Access denied for user: 'mysqltest_2'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'test_$1'
 drop table test_$1.t1;
-ERROR 42000: Access denied for user: 'mysqltest_2'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'test_$1'
 drop database test_$1;
-ERROR 42000: Access denied for user: 'mysqltest_2'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'test_$1'
 select * from test_$1.t1;
-ERROR 42000: Access denied for user: 'mysqltest_3'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'test_$1'
 show create database test_$1;
-ERROR 42000: Access denied for user: 'mysqltest_3'@'localhost' to database 'test_$1'
+ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'test_$1'
 drop table test_$1.t1;
 drop database test_$1;
 delete from mysql.user 

mysql-test/r/subselect.result

@@ -976,7 +976,7 @@ ERROR 42S02: Table 'test.t1' doesn't exist
 CREATE TABLE t1 (a int, KEY(a));
 HANDLER t1 OPEN;
 HANDLER t1 READ a=((SELECT 1));
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1))' at line 1
 HANDLER t1 CLOSE;
 drop table t1;
 create table t1 (a int);
@@ -1714,7 +1714,7 @@ create table t1(id int);
 create table t2(id int);
 create table t3(flag int);
 select (select * from t3 where id not null) from t1, t2;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) from t1, t2' at line 1
 drop table t1,t2,t3;
 CREATE TABLE t1 (id INT);
 CREATE TABLE t2 (id INT);

mysql-test/r/type_blob.result

@@ -27,7 +27,7 @@ t3	CREATE TABLE `t3` (
 drop table t1,t2,t3
 #;
 CREATE TABLE t1 (a char(257) default "hello");
-ERROR 42000: Too big column length for column 'a' (max = 255). Use BLOB instead
+ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB instead
 CREATE TABLE t2 (a blob default "hello");
 ERROR 42000: BLOB/TEXT column 'a' can't have a default value
 drop table if exists t1,t2;

mysql-test/r/type_datetime.result

@@ -36,11 +36,11 @@ test.t1	check	status	OK
 delete from t1;
 insert into t1 values("000101"),("691231"),("700101"),("991231"),("00000101"),("00010101"),("99991231"),("00101000000"),("691231000000"),("700101000000"),("991231235959"),("10000101000000"),("99991231235959"),("20030102030460"),("20030102036301"),("20030102240401"),("20030132030401"),("20031302030460");
 Warnings:
-Warning	1264	Data truncated, out of range for column 't' at row 14
+Warning	1264	Data truncated; out of range for column 't' at row 14
-Warning	1264	Data truncated, out of range for column 't' at row 15
+Warning	1264	Data truncated; out of range for column 't' at row 15
-Warning	1264	Data truncated, out of range for column 't' at row 16
+Warning	1264	Data truncated; out of range for column 't' at row 16
-Warning	1264	Data truncated, out of range for column 't' at row 17
+Warning	1264	Data truncated; out of range for column 't' at row 17
-Warning	1264	Data truncated, out of range for column 't' at row 18
+Warning	1264	Data truncated; out of range for column 't' at row 18
 select * from t1;
 t
 2000-01-01 00:00:00

mysql-test/r/type_decimal.result

@@ -158,14 +158,14 @@ insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 3
@@ -201,29 +201,29 @@ drop  table t1;
 create table t1 (a decimal(10,2) unsigned);
 insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 6
+Warning	1264	Data truncated; out of range for column 'a' at row 6
 insert into t1 values ("-.1"),("+.1"),(".1");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 3
@@ -259,29 +259,29 @@ drop  table t1;
 create table t1 (a decimal(10,2) zerofill);
 insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 6
+Warning	1264	Data truncated; out of range for column 'a' at row 6
 insert into t1 values ("-.1"),("+.1"),(".1");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 Warning	1265	Data truncated for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 3
@@ -321,13 +321,13 @@ insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
 insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
 insert into t1 values (-111111111.11),(+1111111111.11),(1111111111.11);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values (1e+100),(1e-100),(-1e+100);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
 insert into t1 values (123.4e0),(123.4e+2),(123.4e-2),(123e1),(123e+0);
 select * from t1;
 a
@@ -361,8 +361,8 @@ drop  table t1;
 create table t1 (a decimal);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+12345678901'),(99999999999999);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 7
+Warning	1264	Data truncated; out of range for column 'a' at row 7
 select * from t1;
 a
 -9999999999
@@ -376,9 +376,9 @@ drop  table t1;
 create table t1 (a decimal unsigned);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 7
+Warning	1264	Data truncated; out of range for column 'a' at row 7
 select * from t1;
 a
 0
@@ -392,9 +392,9 @@ drop  table t1;
 create table t1 (a decimal zerofill);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 7
+Warning	1264	Data truncated; out of range for column 'a' at row 7
 select * from t1;
 a
 0000000000
@@ -408,9 +408,9 @@ drop  table t1;
 create table t1 (a decimal unsigned zerofill);
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('+1234567890'),(99999999999999);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 2
+Warning	1264	Data truncated; out of range for column 'a' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 7
+Warning	1264	Data truncated; out of range for column 'a' at row 7
 select * from t1;
 a
 0000000000
@@ -425,7 +425,7 @@ create table t1(a decimal(10,0));
 insert into t1 values ("1e4294967295");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 select * from t1;
 a
 99999999999
@@ -433,17 +433,17 @@ delete from t1;
 insert into t1 values("1e4294967297");
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'a' at row 1
+Warning	1264	Data truncated; out of range for column 'a' at row 1
 select * from t1;
 a
 99999999999
 drop table t1;
 CREATE TABLE t1 (a_dec DECIMAL(-1,0));
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,0))' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,0))' at line 1
 CREATE TABLE t1 (a_dec DECIMAL(-2,1));
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '-2,1))' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2,1))' at line 1
 CREATE TABLE t1 (a_dec DECIMAL(-1,1));
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,1))' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1,1))' at line 1
 create table t1(a decimal(7,3));
 insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('+10000000'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('+100000000'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('+1000000000'),('-1000000000'),('1000000000'),('+1000000000'),('-1000000000');
 select * from t1;

mysql-test/r/type_float.result

@@ -15,8 +15,8 @@ f1	float	NULL	YES		NULL		select,insert,update,references
 f2	double	NULL	YES		NULL		select,insert,update,references	
 insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'f1' at row 7
+Warning	1264	Data truncated; out of range for column 'f1' at row 7
-Warning	1264	Data truncated, out of range for column 'f1' at row 8
+Warning	1264	Data truncated; out of range for column 'f1' at row 8
 insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150);
 select * from t1;
 f1	f2

mysql-test/r/type_ranges.result

@@ -89,33 +89,33 @@ insert into t1 values (NULL,2,2,2,2,2,2,2,2,2,2,2,2,2,NULL,NULL,NULL,NULL,NULL,N
 insert into t1 values (0,1/3,3,3,3,3,3,3,3,3,3,3,3,3,NULL,'19970303','10:10:10','19970303101010','','','','3',3,3);
 insert into t1 values (0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,NULL,19970807,080706,19970403090807,-1,-1,-1,'-1',-1,-1);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'utiny' at row 1
+Warning	1264	Data truncated; out of range for column 'utiny' at row 1
-Warning	1264	Data truncated, out of range for column 'ushort' at row 1
+Warning	1264	Data truncated; out of range for column 'ushort' at row 1
-Warning	1264	Data truncated, out of range for column 'umedium' at row 1
+Warning	1264	Data truncated; out of range for column 'umedium' at row 1
-Warning	1264	Data truncated, out of range for column 'ulong' at row 1
+Warning	1264	Data truncated; out of range for column 'ulong' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 Warning	1265	Data truncated for column 'flags' at row 1
 insert into t1 values (0,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,NULL,0,0,0,-4294967295,-4294967295,-4294967295,'-4294967295',0,"one,two,tree");
 Warnings:
 Warning	1265	Data truncated for column 'string' at row 1
-Warning	1264	Data truncated, out of range for column 'tiny' at row 1
+Warning	1264	Data truncated; out of range for column 'tiny' at row 1
-Warning	1264	Data truncated, out of range for column 'short' at row 1
+Warning	1264	Data truncated; out of range for column 'short' at row 1
-Warning	1264	Data truncated, out of range for column 'medium' at row 1
+Warning	1264	Data truncated; out of range for column 'medium' at row 1
-Warning	1264	Data truncated, out of range for column 'long_int' at row 1
+Warning	1264	Data truncated; out of range for column 'long_int' at row 1
-Warning	1264	Data truncated, out of range for column 'utiny' at row 1
+Warning	1264	Data truncated; out of range for column 'utiny' at row 1
-Warning	1264	Data truncated, out of range for column 'ushort' at row 1
+Warning	1264	Data truncated; out of range for column 'ushort' at row 1
-Warning	1264	Data truncated, out of range for column 'umedium' at row 1
+Warning	1264	Data truncated; out of range for column 'umedium' at row 1
-Warning	1264	Data truncated, out of range for column 'ulong' at row 1
+Warning	1264	Data truncated; out of range for column 'ulong' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 insert into t1 values (0,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,NULL,0,0,0,4294967295,4294967295,4294967295,'4294967295',0,0);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'tiny' at row 1
+Warning	1264	Data truncated; out of range for column 'tiny' at row 1
-Warning	1264	Data truncated, out of range for column 'short' at row 1
+Warning	1264	Data truncated; out of range for column 'short' at row 1
-Warning	1264	Data truncated, out of range for column 'medium' at row 1
+Warning	1264	Data truncated; out of range for column 'medium' at row 1
-Warning	1264	Data truncated, out of range for column 'long_int' at row 1
+Warning	1264	Data truncated; out of range for column 'long_int' at row 1
-Warning	1264	Data truncated, out of range for column 'utiny' at row 1
+Warning	1264	Data truncated; out of range for column 'utiny' at row 1
-Warning	1264	Data truncated, out of range for column 'ushort' at row 1
+Warning	1264	Data truncated; out of range for column 'ushort' at row 1
-Warning	1264	Data truncated, out of range for column 'umedium' at row 1
+Warning	1264	Data truncated; out of range for column 'umedium' at row 1
 Warning	1265	Data truncated for column 'options' at row 1
 insert into t1 (tiny) values (1);
 select auto,string,tiny,short,medium,long_int,longlong,real_float,real_double,utiny,ushort,umedium,ulong,ulonglong,mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000),date_field,time_field,date_time,blob_col,tinyblob_col,mediumblob_col,longblob_col from t1;

mysql-test/r/type_time.result

@@ -26,9 +26,9 @@ t
 insert into t1 values("10.22.22"),(1234567),(123456789),(123456789.10),("10 22:22"),("12.45a");
 Warnings:
 Note	1292	Truncated incorrect time value: '10.22.22'
-Warning	1264	Data truncated, out of range for column 't' at row 2
+Warning	1264	Data truncated; out of range for column 't' at row 2
-Warning	1264	Data truncated, out of range for column 't' at row 3
+Warning	1264	Data truncated; out of range for column 't' at row 3
-Warning	1264	Data truncated, out of range for column 't' at row 4
+Warning	1264	Data truncated; out of range for column 't' at row 4
 Note	1292	Truncated incorrect time value: '12.45a'
 select * from t1;
 t

mysql-test/r/type_uint.result

@@ -4,7 +4,7 @@ create table t1 (this int unsigned);
 insert into t1 values (1);
 insert into t1 values (-1);
 Warnings:
-Warning	1264	Data truncated, out of range for column 'this' at row 1
+Warning	1264	Data truncated; out of range for column 'this' at row 1
 select * from t1;
 this
 1

mysql-test/r/union.result

@@ -81,7 +81,7 @@ a	b
 2	b
 1	a
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by t1.b;
-ERROR 42000: Table 't1' from one of SELECTs can not be used in global ORDER clause
+ERROR 42000: Table 't1' from one of the SELECTs cannot be used in global ORDER clause
 explain extended (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	
@@ -341,7 +341,7 @@ select found_rows();
 found_rows()
 4
 (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2 LIMIT 1;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2;
 a
 1

mysql-test/r/varbinary.result

@@ -18,7 +18,7 @@ Warnings:
 Note	1003	select test.t1.ID AS `ID`,test.t1.UNIQ AS `UNIQ` from test.t1 where (test.t1.UNIQ = 4084688022709641610)
 drop table t1;
 select x'hello';
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'x'hello'' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'x'hello'' at line 1
 select 0xfg;
 ERROR 42S22: Unknown column '0xfg' in 'field list'
 create table t1 select 1 as x, 2 as xx;

mysql-test/r/variables.result

@@ -427,12 +427,12 @@ select @a, @b;
 @a	@b
 2	1
 set @@global.global.key_buffer_size= 1;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1
 set GLOBAL global.key_buffer_size= 1;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size= 1' at line 1
 SELECT @@global.global.key_buffer_size;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1
 SELECT @@global.session.key_buffer_size;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1
 SELECT @@global.local.key_buffer_size;
-ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1

mysql-test/r/warnings.result

@@ -43,13 +43,13 @@ drop table t1;
 create table t1(a tinyint, b int not null, c date, d char(5));
 load data infile '../../std_data/warnings_loaddata.dat' into table t1 fields terminated by ',';
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'b' at row 2
 Warning	1265	Data truncated for column 'd' at row 3
 Warning	1265	Data truncated for column 'c' at row 4
 Warning	1261	Row 5 doesn't contain data for all columns
 Warning	1265	Data truncated for column 'b' at row 6
 Warning	1262	Row 7 was truncated; it contained more data than there were input columns
-Warning	1264	Data truncated, out of range for column 'a' at row 8
+Warning	1264	Data truncated; out of range for column 'a' at row 8
 select @@warning_count;
 @@warning_count
 7
@@ -57,11 +57,11 @@ drop table t1;
 create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
 insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1
-Warning	1264	Data truncated, out of range for column 'b' at row 2
+Warning	1264	Data truncated; out of range for column 'b' at row 2
 Warning	1265	Data truncated for column 'c' at row 2
-Warning	1264	Data truncated, out of range for column 'a' at row 3
+Warning	1264	Data truncated; out of range for column 'a' at row 3
-Warning	1264	Data truncated, out of range for column 'b' at row 3
+Warning	1264	Data truncated; out of range for column 'b' at row 3
 Warning	1265	Data truncated for column 'c' at row 3
 alter table t1 modify c char(4);
 Warnings:
@@ -70,7 +70,7 @@ Warning	1265	Data truncated for column 'c' at row 2
 alter table t1 add d char(2);
 update t1 set a=NULL where a=10;
 Warnings:
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 2
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 2
 update t1 set c='mysql ab' where c='test';
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 4
@@ -86,7 +86,7 @@ Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b' at row 2
 Warning	1265	Data truncated for column 'b' at row 3
-Warning	1263	Data truncated, NULL supplied to NOT NULL column 'a' at row 4
+Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 4
 Warning	1265	Data truncated for column 'b' at row 4
 insert into t2(b) values('mysqlab');
 Warnings:

sql/share/czech/errmsg.txt

@@ -262,21 +262,21 @@ character-set=latin2
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -284,7 +284,7 @@ character-set=latin2
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -305,8 +305,8 @@ character-set=latin2
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/danish/errmsg.txt

@@ -126,7 +126,7 @@ character-set=latin1
 "For mange felter",
 "For store poster. Max post st<73>rrelse, uden BLOB's, er %d. Du m<> lave nogle felter til BLOB's",
 "Thread stack brugt:  Brugt: %ld af en %ld stak.  Brug 'mysqld -O thread_stack=#' for at allokere en st<73>rre stak om n<>dvendigt",
-"Krydsreferencer fundet i OUTER JOIN.  Check dine ON conditions",
+"Krydsreferencer fundet i OUTER JOIN; check dine ON conditions",
 "Kolonne '%-.32s' bruges som UNIQUE eller INDEX men er ikke defineret som NOT NULL",
 "Kan ikke l<>se funktionen '%-.64s'",
 "Kan ikke starte funktionen '%-.64s'; %-.80s",
@@ -208,7 +208,7 @@ character-set=latin1
 "Denne handling kr<6B>ver en k<>rende slave. Konfigurer en slave og brug kommandoen START SLAVE",
 "Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO",
 "Could not initialize master info structure, more error messages can be found in the MySQL error log",
-"Kunne ikke danne en slave-tr<74>d. Check systemressourcerne",
+"Kunne ikke danne en slave-tr<74>d; check systemressourcerne",
 "Brugeren %-.64s har allerede mere end 'max_user_connections' aktive forbindelser",
 "Du m<> kun bruge konstantudtryk med SET",
 "Lock wait timeout overskredet",
@@ -256,21 +256,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -278,7 +278,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -299,8 +299,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Modtog fejl %d '%-.100s' fra %s",
 "Modtog temporary fejl %d '%-.100s' fra %s",

sql/share/dutch/errmsg.txt

@@ -264,21 +264,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -286,7 +286,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -307,8 +307,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/english/errmsg.txt

@@ -25,7 +25,7 @@ character-set=latin1
 "Can't change dir to '%-.64s' (errno: %d)",
 "Record has changed since last read in table '%-.64s'",
 "Disk full (%s); waiting for someone to free some space...",
-"Can't write, duplicate key in table '%-.64s'",
+"Can't write; duplicate key in table '%-.64s'",
 "Error on close of '%-.64s' (errno: %d)",
 "Error reading file '%-.64s' (errno: %d)",
 "Error on rename of '%-.64s' to '%-.64s' (errno: %d)",
@@ -44,11 +44,11 @@ character-set=latin1
 "Out of sort memory; increase server sort buffer size",
 "Unexpected EOF found when reading file '%-.64s' (errno: %d)",
 "Too many connections",
-"Out of memory; check if mysqld or some other process uses all available memory. If not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space",
+"Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space",
 "Can't get hostname for your address",
 "Bad handshake",
-"Access denied for user: '%-.32s'@'%-.64s' to database '%-.64s'",
+"Access denied for user '%-.32s'@'%-.64s' to database '%-.64s'",
-"Access denied for user: '%-.32s'@'%-.64s' (Using password: %s)",
+"Access denied for user '%-.32s'@'%-.64s' (using password: %s)",
 "No database selected",
 "Unknown command",
 "Column '%-.64s' cannot be null",
@@ -77,7 +77,7 @@ character-set=latin1
 "Specified key was too long; max key length is %d bytes",
 "Key column '%-.64s' doesn't exist in table",
 "BLOB column '%-.64s' can't be used in key specification with the used table type",
-"Too big column length for column '%-.64s' (max = %d). Use BLOB instead",
+"Column length too big for column '%-.64s' (max = %d); use BLOB instead",
 "Incorrect table definition; there can be only one auto column and it must be defined as a key",
 "%s: ready for connections.\nVersion: '%s'  socket: '%s'  port: %d\n",
 "%s: Normal shutdown\n",
@@ -86,8 +86,8 @@ character-set=latin1
 "%s: Forcing close of thread %ld  user: '%-.32s'\n",
 "Can't create IP socket",
 "Table '%-.64s' has no index like the one used in CREATE INDEX. Recreate the table",
-"Field separator argument is not what is expected. Check the manual",
+"Field separator argument is not what is expected; check the manual",
-"You can't use fixed rowlength with BLOBs. Please use 'fields terminated by'",
+"You can't use fixed rowlength with BLOBs; please use 'fields terminated by'",
 "The file '%-.64s' must be in the database directory or be readable by all",
 "File '%-.80s' already exists",
 "Records: %ld  Deleted: %ld  Skipped: %ld  Warnings: %ld",
@@ -107,7 +107,7 @@ character-set=latin1
 "BLOB/TEXT column '%-.64s' can't have a default value",
 "Incorrect database name '%-.100s'",
 "Incorrect table name '%-.100s'",
-"The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok",
+"The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay",
 "Unknown error",
 "Unknown procedure '%-.64s'",
 "Incorrect parameter count to procedure '%-.64s'",
@@ -119,40 +119,40 @@ character-set=latin1
 "A table must have at least 1 column",
 "The table '%-.64s' is full",
 "Unknown character set: '%-.64s'",
-"Too many tables. MySQL can only use %d tables in a join",
+"Too many tables; MySQL can only use %d tables in a join",
 "Too many columns",
-"Too big row size. The maximum row size for the used table type, not counting BLOBs, is %ld. You have to change some fields to TEXT or BLOBs",
+"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",
 "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.64s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
 "Can't load function '%-.64s'",
 "Can't initialize function '%-.64s'; %-.80s",
 "No paths allowed for shared library",
-"Function '%-.64s' already exist",
+"Function '%-.64s' already exists",
 "Can't open shared library '%-.64s' (errno: %d %-.64s)",
 "Can't find function '%-.64s' in library'",
 "Function '%-.64s' is not defined",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
+"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
 "Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
+"You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
 "Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s'",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privileges can be used",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privileges can be used",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%-.64s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
 "The used command is not allowed with this MySQL version",
-"You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use",
+"You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use",
 "Delayed insert thread couldn't get requested lock for table %-.64s",
 "Too many delayed threads in use",
 "Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)",
@@ -174,7 +174,7 @@ character-set=latin1
 "All tables in the MERGE table are not identically defined",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB/TEXT column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -253,9 +253,9 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
@@ -263,11 +263,11 @@ character-set=latin1
 "ZLIB: Not enough memory",
 "ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
 "ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -297,7 +297,7 @@ character-set=latin1
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated incorrect %-.32s value: '%-.128s'"
 "Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/estonian/errmsg.txt

@@ -258,21 +258,21 @@ character-set=latin7
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -280,7 +280,7 @@ character-set=latin7
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -301,8 +301,8 @@ character-set=latin7
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/french/errmsg.txt

@@ -253,21 +253,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -296,8 +296,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/german/errmsg.txt

@@ -272,10 +272,10 @@ character-set=latin1
 "Slave l<>uft bereits",
 "Slave wurde bereits angehalten",
 "Unkomprimierte Daten sind zu gro<72>. Die maximale Gr<47><72>e betr<74>gt %d",
-"Z_MEM_ERROR: F<>r zlib steht nicht genug Speicher zur Verf<72>gung",
+"ZLIB: Steht nicht genug Speicher zur Verf<72>gung",
-"Z_BUF_ERROR: Im Ausgabepuffer ist nicht genug Platz f<EFBFBD>r zlib vorhanden (wahrscheinlich wurde die L<>nge der unkomprimierten Daten besch<63>digt)",
+"ZLIB: Im Ausgabepuffer ist nicht genug Platz vorhanden (wahrscheinlich wurde die L<>nge der unkomprimierten Daten besch<63>digt)",
-"Z_DATA_ERROR: Eingabedaten f<EFBFBD>r zlib besch<EFBFBD>digt",
+"ZLIB: Eingabedaten besch<63>digt",
-"%d Zeile(n) durch group_concat() abgeschnitten",
+"%d Zeile(n) durch GROUP_CONCAT() abgeschnitten",
 "Anzahl der Datens<6E>tze in Zeile %ld geringer als Anzahl der Spalten",
 "Anzahl der Datens<6E>tze in Zeile %ld gr<67><72>er als Anzahl der Spalten",
 "Daten abgeschnitten, NULL f<>r NOT NULL-Spalte '%s' in Zeile %ld angegeben",
@@ -308,8 +308,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/greek/errmsg.txt

@@ -138,16 +138,16 @@ character-set=greek
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (update) <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> mysql <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> passwords <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
 "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s'",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privileges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privileges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%-.64s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -174,7 +174,7 @@ character-set=greek
 "All tables in the MERGE table are not identically defined",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -253,21 +253,21 @@ character-set=greek
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=greek
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -296,8 +296,8 @@ character-set=greek
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/hungarian/errmsg.txt

@@ -109,7 +109,7 @@ character-set=latin2
 "A(z) '%-.64s' blob objektumnak nem lehet alapertelmezett erteke",
 "Hibas adatbazisnev: '%-.100s'",
 "Hibas tablanev: '%-.100s'",
-"A SELECT tul sok rekordot fog megvizsgalni es nagyon sokaig fog tartani. Ellenorizze a WHERE-t es hasznalja a SET SQL_BIG_SELECTS=1 beallitast, ha a SELECT ok",
+"A SELECT tul sok rekordot fog megvizsgalni es nagyon sokaig fog tartani. Ellenorizze a WHERE-t es hasznalja a SET SQL_BIG_SELECTS=1 beallitast, ha a SELECT okay",
 "Ismeretlen hiba",
 "Ismeretlen eljaras: '%-.64s'",
 "Rossz parameter a(z) '%-.64s'eljaras szamitasanal",
@@ -255,21 +255,21 @@ character-set=latin2
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=latin2
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -298,8 +298,8 @@ character-set=latin2
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/italian/errmsg.txt

@@ -253,21 +253,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -296,8 +296,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/japanese/errmsg.txt

@@ -50,7 +50,7 @@ character-set=ujis
 "<22><><EFBFBD><EFBFBD> address <20><> hostname <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>.",
 "Bad handshake",
 "<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s'@'%-.64s' <20><> '%-.64s' <20>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD>١<EFBFBD><D9A1><EFBFBD><EFBFBD>ؤΥ<D8A4><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݤ<EFBFBD><DDA4>ޤ<EFBFBD>",
-"<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s'@'%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>ݤ<EFBFBD><DDA4>ޤ<EFBFBD>.(Using password: %s)",
+"<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s'@'%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>ݤ<EFBFBD><DDA4>ޤ<EFBFBD>.uUsing password: %s)",
 "<22>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD>١<EFBFBD><D9A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤵤<EFBFBD><F2A4B5A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>.",
 "<22><><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5>ɤϲ<C9A4><CFB2><EFBFBD>",
 "Column '%-.64s' <20><> null <20>ˤϤǤ<CFA4><C7A4>ʤ<EFBFBD><CAA4>ΤǤ<CEA4>",
@@ -80,7 +80,7 @@ character-set=ujis
 "Key column '%-.64s' <20><><EFBFBD>ơ<EFBFBD><C6A1>֥<EFBFBD><D6A5>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>.",
 "BLOB column '%-.64s' can't be used in key specification with the used table type",
 "column '%-.64s' <20><>,<2C><><EFBFBD>ݤ<EFBFBD><DDA4><EFBFBD> column <20><><EFBFBD>礭<EFBFBD><E7A4AD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. (<28><><EFBFBD><EFBFBD> %d <20>ޤ<EFBFBD>). BLOB <20>򤫤<EFBFBD><F2A4ABA4><EFBFBD><EFBFBD>˻<EFBFBD><CBBB>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",
-"<22>ơ<EFBFBD><C6A1>֥<EFBFBD><D6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㤤<EFBFBD>ޤ<EFBFBD>; There can only be one auto column and it must be defined as a key",
+"<22>ơ<EFBFBD><C6A1>֥<EFBFBD><D6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㤤<EFBFBD>ޤ<EFBFBD>; there can be only one auto column and it must be defined as a key",
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ\n",
 "%s: Normal shutdown\n",
 "%s: Got signal %d. <20><><EFBFBD><EFBFBD>!\n",
@@ -88,15 +88,15 @@ character-set=ujis
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ  user: '%-.64s'\n",
 "IP socket <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>",
 "Table '%-.64s' <20>Ϥ<EFBFBD><CFA4>Τ褦<CEA4><E8A4A6> index <20><><EFBFBD><EFBFBD><EFBFBD>äƤ<C3A4><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>(CREATE INDEX <20>¹Ի<C2B9><D4BB>˻<EFBFBD><CBBB>ꤵ<EFBFBD><EAA4B5><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>). <20>ơ<EFBFBD><C6A1>֥<EFBFBD><D6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE><EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-"Field separator argument is not what is expected. Check the manual",
+"Field separator argument is not what is expected; check the manual",
-"You can't use fixed rowlength with BLOBs. Please use 'fields terminated by'.",
+"You can't use fixed rowlength with BLOBs; please use 'fields terminated by'.",
 "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> databse <20><> directory <20>ˤ<EFBFBD><CBA4>뤫<EFBFBD><EBA4AB><EFBFBD>ƤΥ桼<CEA5><E6A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>褦<EFBFBD>˵<EFBFBD><CBB5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ʤ<EFBFBD><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>.",
 "File '%-.64s' <20>ϴ<EFBFBD><CFB4><EFBFBD>¸<EFBFBD>ߤ<EFBFBD><DFA4>ޤ<EFBFBD>",
 "<22>쥳<EFBFBD><ECA5B3><EFBFBD>ɿ<EFBFBD>: %ld  <20><><EFBFBD><EFBFBD>: %ld  Skipped: %ld  Warnings: %ld",
 "<22>쥳<EFBFBD><ECA5B3><EFBFBD>ɿ<EFBFBD>: %ld  <20><>ʣ: %ld",
 "Incorrect sub part key. The used key part isn't a string or the used length is longer than the key part",
 "ALTER TABLE <20><><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD> column <20>Ϻ<EFBFBD><CFBA><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>. DROP TABLE <20><><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-"'%-.64s' <20><><EFBFBD>˴<EFBFBD><CBB4>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>. Check that column/key exists",
+"'%-.64s' <20><><EFBFBD>˴<EFBFBD><CBB4>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>; check that column/key exists",
 "<22>쥳<EFBFBD><ECA5B3><EFBFBD>ɿ<EFBFBD>: %ld  <20><>ʣ<EFBFBD><CAA3>: %ld  Warnings: %ld",
 "You can't specify target table '%-.64s' for update in FROM clause",
 "thread id: %lu <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>",
@@ -109,7 +109,7 @@ character-set=ujis
 "BLOB column '%-.64s' can't have a default value",
 "<22><><EFBFBD>ꤷ<EFBFBD><EAA4B7> database ̾ '%-.100s' <20><><EFBFBD>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>",
 "<22><><EFBFBD>ꤷ<EFBFBD><EAA4B7> table ̾ '%-.100s' <20>Ϥޤ<CFA4><DEA4><EFBFBD><EFBFBD>äƤ<C3A4><C6A4>ޤ<EFBFBD>",
-"The SELECT would examine more rows than MAX_JOIN_SIZE. Check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is ok",
+"The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay",
 "Unknown error",
 "Unknown procedure '%-.64s'",
 "Incorrect parameter count to procedure '%-.64s'",
@@ -121,11 +121,11 @@ character-set=ujis
 "<22>ơ<EFBFBD><C6A1>֥<EFBFBD><D6A5>Ϻ<EFBFBD><CFBA><EFBFBD> 1 <20>Ĥ<EFBFBD> column <20><>ɬ<EFBFBD>פǤ<D7A4>",
 "table '%-.64s' <20>Ϥ<EFBFBD><CFA4>äѤ<C3A4><D1A4>Ǥ<EFBFBD>",
 "character set '%-.64s' <20>ϥ<EFBFBD><CFA5>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>",
-"<22>ơ<EFBFBD><C6A1>֥뤬¿<EBA4AC><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. MySQL can only use %d tables in a join",
+"<22>ơ<EFBFBD><C6A1>֥뤬¿<EBA4AC><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>; MySQL can only use %d tables in a join",
 "column <20><>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>",
 "row size <20><><EFBFBD>礭<EFBFBD><E7A4AD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. BLOB <20><><EFBFBD>ޤޤʤ<DEA4><CAA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> row size <20>κ<EFBFBD><CEBA><EFBFBD><EFBFBD><EFBFBD> %d <20>Ǥ<EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD> field <20><> BLOB <20><><EFBFBD>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",
 "Thread stack overrun:  Used: %ld of a %ld stack.  <20><><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5>ΰ<EFBFBD><CEB0><EFBFBD>¿<EFBFBD><C2BF><EFBFBD>Ȥꤿ<C8A4><EAA4BF><EFBFBD><EFBFBD><EFBFBD>硢'mysqld -O thread_stack=#' <20>Ȼ<EFBFBD><C8BB>ꤷ<EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.64s' <20><> UNIQUE <20><> INDEX <20>ǻ<EFBFBD><C7BB>Ѥ<EFBFBD><D1A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>. <20><><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NOT NULL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>.",
 "function '%-.64s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ɤǤ<C9A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>",
 "function '%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>; %-.80s",
@@ -145,11 +145,11 @@ character-set=ujis
 "Can't reopen table: '%-.64s'",
 "NULL <20>ͤλ<CDA4><CEBB><EFBFBD><EFBFBD><EFBFBD>ˡ<EFBFBD><CBA1><EFBFBD><EFBFBD>Ŭ<EFBFBD>ڤǤ<DAA4>",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "<22>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s' (<28>ۥ<EFBFBD><DBA5><EFBFBD> '%-.64s' <20>Υ桼<CEA5><E6A1BC><EFBFBD><EFBFBD>) <20>ϵ<EFBFBD><CFB5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>",
 "<22><><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD> %-.16s <20><> <20>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s'@'%-.64s' ,<2C>ơ<EFBFBD><C6A1>֥<EFBFBD> '%-.64s' <20><><EFBFBD>Ф<EFBFBD><D0A4>Ƶ<EFBFBD><C6B5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>",
 "<22><><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD> %-.16s <20><> <20>桼<EFBFBD><E6A1BC><EFBFBD><EFBFBD> '%-.32s'@'%-.64s'\n <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20>ơ<EFBFBD><C6A1>֥<EFBFBD> '%-.64s' <20><><EFBFBD>Ф<EFBFBD><D0A4>Ƶ<EFBFBD><C6B5>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -176,7 +176,7 @@ character-set=ujis
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -255,21 +255,21 @@ character-set=ujis
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=ujis
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -299,7 +299,7 @@ character-set=ujis
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
 "Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got NDB error %d '%-.100s'",
 "Got temporary NDB error %d '%-.100s'",

sql/share/korean/errmsg.txt

@@ -48,7 +48,7 @@ character-set=euckr
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ǻ<EFBFBD><C7BB><EFBFBD><EFBFBD> ȣ<><C8A3>Ʈ<EFBFBD≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
 "Bad handshake",
 "'%-.32s'@'%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD> '%-.64s' <20><><EFBFBD><EFBFBD>Ÿ<EFBFBD><C5B8><EFBFBD>̽<EFBFBD><CCBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ź<EFBFBD> <20>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
-"'%-.32s'@'%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ź<EFBFBD> <20>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>. (Using password: %s)",
+"'%-.32s'@'%-.64s' <20><><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ź<EFBFBD> <20>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>. (using password: %s)",
 "<22><><EFBFBD>õ<EFBFBD> <20><><EFBFBD><EFBFBD>Ÿ<EFBFBD><C5B8><EFBFBD>̽<EFBFBD><CCBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
 "<22><><EFBFBD>ɾ <20><><EFBFBD><EFBFBD> <20>𸣰ھ<F0B8A3B0><DABE><EFBFBD>...",
 "Į<><C4AE> '%-.64s'<27><> <20><>(Null)<29><> <20>Ǹ<EFBFBD> <20>ȵ˴ϴ<CBB4>. ",
@@ -123,7 +123,7 @@ character-set=euckr
 "Į<><C4AE><EFBFBD><EFBFBD> <20>ʹ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
 "<22>ʹ<EFBFBD> ū row <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>. BLOB<4F><42> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʰ<EFBFBD> <20>ִ<EFBFBD> row <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d<>Դϴ<D4B4>. <20>󸶰<EFBFBD><F3B8B6B0><EFBFBD> <20>ʵ<EFBFBD><CAB5><EFBFBD><EFBFBD><EFBFBD> BLOB<4F><42> <20>ٲټž<D9BC> <20>ڱ<EFBFBD><DAB1><EFBFBD>..",
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ƽ<EFBFBD><C6BD>ϴ<EFBFBD>.  <20><><EFBFBD><EFBFBD>: %ld<6C><64> <20><><EFBFBD><EFBFBD>: %ld<6C><64>.  <20><><EFBFBD><EFBFBD> <20>ʿ<EFBFBD><CABF><EFBFBD> <20><>ū <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>Ҷ<EFBFBD><D2B6><EFBFBD><EFBFBD><EFBFBD> 'mysqld -O thread_stack=#' <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "'%-.64s' Į<><C4AE><EFBFBD><EFBFBD> UNIQUE<55><45> INDEX<45><58> <20><><EFBFBD><EFBFBD><EFBFBD>Ͽ<EFBFBD><CFBF><EFBFBD><EFBFBD><EFBFBD> NOT NULL<4C><4C> <20><><EFBFBD>ǵ<EFBFBD><C7B5><EFBFBD> <20>ʾұ<CABE><D2B1><EFBFBD>...",
 "'%-.64s' <20>Լ<EFBFBD><D4BC><EFBFBD> <20>ε<EFBFBD><CEB5><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>߽<EFBFBD><DFBD>ϴ<EFBFBD>.",
 "'%-.64s' <20>Լ<EFBFBD><D4BC><EFBFBD> <20>ʱ<EFBFBD>ȭ <20><><EFBFBD><EFBFBD> <20><><EFBFBD>߽<EFBFBD><DFBD>ϴ<EFBFBD>.; %-.80s",
@@ -143,7 +143,7 @@ character-set=euckr
 "<22><><EFBFBD>̺<EFBFBD><CCBA><EFBFBD> <20>ٽ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: '%-.64s",
 "NULL <20><><EFBFBD><EFBFBD> <20>߸<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϼ̱<CFBC><CCB1><EFBFBD>...",
 "regexp<78><70><EFBFBD><EFBFBD> '%-.64s'<27><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
-"Mixing of GROUP Į<><C4AE>s (MIN(),MAX(),COUNT()...) with no GROUP Į<><C4AE>s is illegal if there is no GROUP BY clause",
+"Mixing of GROUP Į<><C4AE>s (MIN(),MAX(),COUNT(),...) with no GROUP Į<><C4AE>s is illegal if there is no GROUP BY clause",
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.32s' (ȣ<><C8A3>Ʈ '%-.64s')<29><> <20><><EFBFBD>Ͽ<EFBFBD> <20><><EFBFBD>ǵ<EFBFBD> <20>׷<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>.",
 "'%-.16s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ڿ<EFBFBD><DABF><EFBFBD> <20>źεǾ<CEB5><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>. : '%-.32s'@'%-.64s' for <20><><EFBFBD>̺<EFBFBD> '%-.64s'",
 "'%-.16s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ڿ<EFBFBD><DABF><EFBFBD> <20>źεǾ<CEB5><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>. : '%-.32s'@'%-.64s' for Į<><C4AE> '%-.64s' in <20><><EFBFBD>̺<EFBFBD> '%-.64s'",
@@ -174,7 +174,7 @@ character-set=euckr
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -253,21 +253,21 @@ character-set=euckr
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=euckr
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -296,8 +296,8 @@ character-set=euckr
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/norwegian-ny/errmsg.txt

@@ -121,35 +121,35 @@ character-set=latin1
 "A table must have at least 1 column",
 "The table '%-.64s' is full",
 "Unknown character set: '%-.64s'",
-"Too many tables. MySQL can only use %d tables in a join",
+"Too many tables; MySQL can only use %d tables in a join",
-"Too many fields",
+"Too many columns",
-"Too big row size. The maximum row size, not counting blobs, is %d. You have to change some fields to blobs",
+"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",
 "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
 "Can't load function '%-.64s'",
 "Can't initialize function '%-.64s'; %-.80s",
 "No paths allowed for shared library",
-"Function '%-.64s' already exist",
+"Function '%-.64s' already exists",
 "Can't open shared library '%-.64s' (errno: %d %s)",
 "Can't find function '%-.64s' in library'",
 "Function '%-.64s' is not defined",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
+"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
 "Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
+"You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
 "Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -176,7 +176,7 @@ character-set=latin1
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -255,21 +255,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -298,8 +298,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Mottok feil %d '%-.100s' fra %s",
 "Mottok temporary feil %d '%-.100s' fra %s",

sql/share/norwegian/errmsg.txt

@@ -121,35 +121,35 @@ character-set=latin1
 "A table must have at least 1 column",
 "The table '%-.64s' is full",
 "Unknown character set: '%-.64s'",
-"Too many tables. MySQL can only use %d tables in a join",
+"Too many tables; MySQL can only use %d tables in a join",
-"Too many fields",
+"Too many columns",
-"Too big row size. The maximum row size, not counting blobs, is %d. You have to change some fields to blobs",
+"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",
 "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
 "Can't load function '%-.64s'",
 "Can't initialize function '%-.64s'; %-.80s",
 "No paths allowed for shared library",
-"Function '%-.64s' already exist",
+"Function '%-.64s' already exists",
 "Can't open shared library '%-.64s' (errno: %d %s)",
 "Can't find function '%-.64s' in library'",
 "Function '%-.64s' is not defined",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
+"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
 "Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
+"You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
 "Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -176,7 +176,7 @@ character-set=latin1
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -255,21 +255,21 @@ character-set=latin1
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -298,8 +298,8 @@ character-set=latin1
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Mottok feil %d '%-.100s' fa %s",
 "Mottok temporary feil %d '%-.100s' fra %s",

sql/share/polish/errmsg.txt

@@ -51,8 +51,8 @@ character-set=latin2
 "Zbyt ma<6D>o miejsca/pami<6D>ci dla w?tku",
 "Nie mo<6D>na otrzyma<6D> nazwy hosta dla twojego adresu",
 "Z<>y uchwyt(handshake)",
-"Access denied for user: '%-.32s'@'%-.64s' to database '%-.64s'",
+"Access denied for user '%-.32s'@'%-.64s' to database '%-.64s'",
-"Access denied for user: '%-.32s'@'%-.64s' (Using password: %s)",
+"Access denied for user '%-.32s'@'%-.64s' (using password: %s)",
 "Nie wybrano <20>adnej bazy danych",
 "Nieznana komenda",
 "Kolumna '%-.64s' nie mo<6D>e by<62> null",
@@ -123,35 +123,35 @@ character-set=latin2
 "A table must have at least 1 column",
 "The table '%-.64s' is full",
 "Unknown character set: '%-.64s'",
-"Too many tables. MySQL can only use %d tables in a join",
+"Too many tables; MySQL can only use %d tables in a join",
-"Too many fields",
+"Too many columns",
-"Too big row size. The maximum row size, not counting blobs, is %d. You have to change some fields to blobs",
+"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",
 "Thread stack overrun:  Used: %ld of a %ld stack.  Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed",
-"Cross dependency found in OUTER JOIN.  Examine your ON conditions",
+"Cross dependency found in OUTER JOIN; examine your ON conditions",
 "Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
 "Can't load function '%-.64s'",
 "Can't initialize function '%-.64s'; %-.80s",
 "No paths allowed for shared library",
-"Function '%-.64s' already exist",
+"Function '%-.64s' already exists",
 "Can't open shared library '%-.64s' (errno: %d %s)",
 "Can't find function '%-.64s' in library'",
 "Function '%-.64s' is not defined",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
+"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
 "Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
+"You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
 "Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -178,7 +178,7 @@ character-set=latin2
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -257,21 +257,21 @@ character-set=latin2
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -279,7 +279,7 @@ character-set=latin2
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -300,8 +300,8 @@ character-set=latin2
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/portuguese/errmsg.txt

@@ -78,7 +78,7 @@ character-set=latin1
 "Chave especificada longa demais. O comprimento de chave m<>ximo permitido <20> %d",
 "Coluna chave '%-.64s' n<>o existe na tabela",
 "Coluna BLOB '%-.64s' n<>o pode ser utilizada na especifica<63><61>o de chave para o tipo de tabela usado",
-"Comprimento da coluna '%-.64s' grande demais (max = %d). Use BLOB em seu lugar",
+"Comprimento da coluna '%-.64s' grande demais (max = %d); use BLOB em seu lugar",
 "Defini<6E><69>o incorreta de tabela. Somente <20> permitido um <20>nico campo auto-incrementado e ele tem que ser definido como chave",
 "%s: Pronto para conex<65>es\n",
 "%s: 'Shutdown' normal\n",
@@ -124,7 +124,7 @@ character-set=latin1
 "Colunas demais",
 "Tamanho de linha grande demais. O m<>ximo tamanho de linha, n<>o contando BLOBs, <20> %d. Voc<6F> tem que mudar alguns campos para BLOBs",
 "Estouro da pilha do 'thread'. Usados %ld de uma pilha de %ld . Use 'mysqld -O thread_stack=#' para especificar uma pilha maior, se necess<73>rio",
-"Depend<6E>ncia cruzada encontrada em jun<75><6E>o externa (OUTER JOIN).  Examine as condi<64><69>es utilizadas nas cl<63>usulas 'ON'",
+"Depend<6E>ncia cruzada encontrada em jun<75><6E>o externa (OUTER JOIN); examine as condi<64><69>es utilizadas nas cl<63>usulas 'ON'",
 "Coluna '%-.64s' <20> usada com <20>nica (UNIQUE) ou <20>ndice (INDEX), mas n<>o est<73> definida como n<>o-nula (NOT NULL)",
 "N<>o pode carregar a fun<75><6E>o '%-.64s'",
 "N<>o pode inicializar a fun<75><6E>o '%-.64s' - '%-.80s'",
@@ -261,10 +261,10 @@ character-set=latin1
 "O slave j<> est<73> rodando",
 "O slave j<> est<73> parado",
 "Tamanho muito grande dos dados des comprimidos. O m<>ximo tamanho <20> %d. (provavelmente, o comprimento dos dados descomprimidos est<73> corrupto)",
-"Z_MEM_ERROR: N<>o suficiente mem<65>ria dispon<6F>vel para zlib",
+"ZLIB: N<>o suficiente mem<65>ria dispon<6F>vel",
-"Z_BUF_ERROR: N<>o suficiente espa<70>o no buffer emissor para zlib (provavelmente, o comprimento dos dados descomprimidos est<73> corrupto)",
+"ZLIB: N<>o suficiente espa<70>o no buffer emissor (provavelmente, o comprimento dos dados descomprimidos est<73> corrupto)",
-"Z_DATA_ERROR: Dados de entrada est<73> corrupto para zlib",
+"ZLIB: Dados de entrada est<73> corrupto",
-"%d linha(s) foi(foram) cortada(s) por group_concat()",
+"%d linha(s) foram cortada(s) por GROUP_CONCAT()",
 "Conta de registro <20> menor que a conta de coluna na linha %ld",
 "Conta de registro <20> maior que a conta de coluna na linha %ld",
 "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld",

sql/share/romanian/errmsg.txt

@@ -111,7 +111,7 @@ character-set=latin2
 "Coloana BLOB '%-.64s' nu poate avea o valoare default",
 "Numele bazei de date este incorect '%-.100s'",
 "Numele tabelei este incorect '%-.100s'",
-"SELECT-ul ar examina prea multe cimpuri si probabil ar lua prea mult timp. Verifica clauza WHERE si foloseste SET SQL_BIG_SELECTS=1 daca SELECT-ul e ok",
+"SELECT-ul ar examina prea multe cimpuri si probabil ar lua prea mult timp; verifica clauza WHERE si foloseste SET SQL_BIG_SELECTS=1 daca SELECT-ul e okay",
 "Eroare unknown",
 "Procedura unknown '%-.64s'",
 "Procedura '%-.64s' are un numar incorect de parametri",
@@ -257,21 +257,21 @@ character-set=latin2
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -279,7 +279,7 @@ character-set=latin2
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -300,8 +300,8 @@ character-set=latin2
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/russian/errmsg.txt

@@ -255,21 +255,21 @@ character-set=koi8r
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s)",
 "Every derived table must have its own alias",
 "Select %u <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -277,7 +277,7 @@ character-set=koi8r
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --secure-auth (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>), <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'@'%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Σ<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
@@ -298,8 +298,8 @@ character-set=koi8r
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/serbian/errmsg.txt

@@ -259,21 +259,21 @@ character-set=cp1250
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -281,7 +281,7 @@ character-set=cp1250
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -302,8 +302,8 @@ character-set=cp1250
 "The MySQL server is running with the %s option so it cannot execute this statement"
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/slovak/errmsg.txt

@@ -140,22 +140,22 @@ character-set=latin2
 "Nem<65><6D>em otvori<72> zdie<69>an<61> kni<6E>nicu '%-.64s' (chybov<6F> k<>d: %d %s)",
 "Nem<65><6D>em n<>js<6A> funkciu '%-.64s' v kni<6E>nici'",
 "Funkcia '%-.64s' nie je definovan<61>",
-"Host '%-.64s' is blocked because of many connection errors.  Unblock with 'mysqladmin flush-hosts'",
+"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
 "Host '%-.64s' is not allowed to connect to this MySQL server",
-"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
+"You are using MySQL as an anonymous user and anonymous users are not allowed to change passwords",
 "You must have privileges to update tables in the mysql database to be able to change passwords for others",
 "Can't find any matching row in the user table",
 "Rows matched: %ld  Changed: %ld  Warnings: %ld",
-"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",
+"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",
 "Column count doesn't match value count at row %ld",
 "Can't reopen table: '%-.64s",
 "Invalid use of NULL value",
 "Got error '%-.64s' from regexp",
-"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
+"Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause",
 "There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
-"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
+"Illegal GRANT/REVOKE command; please consult the manual to see which privleges can be used.",
 "The host or user argument to GRANT is too long",
 "Table '%-.64s.%s' doesn't exist",
 "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
@@ -182,7 +182,7 @@ character-set=latin2
 "All tables in the MERGE table are not defined identically",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB column '%-.64s' used in key specification without a key length",
-"All parts of a PRIMARY KEY must be NOT NULL;  If you need NULL in a key, use UNIQUE instead",
+"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",
 "Result consisted of more than one row",
 "This table type requires a primary key",
 "This version of MySQL is not compiled with RAID support",
@@ -261,21 +261,21 @@ character-set=latin2
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have its own alias",
 "Select %u was reduced during optimization",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -283,7 +283,7 @@ character-set=latin2
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -304,8 +304,8 @@ character-set=latin2
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",

sql/share/spanish/errmsg.txt

@@ -125,7 +125,7 @@ character-set=latin1
 "Muchos campos",
 "Tama<6D>o de l<>nea muy grande. M<>ximo tama<6D>o de l<>nea, no contando blob, es %d. Tu tienes que cambiar algunos campos para blob",
 "Sobrecarga de la pila de thread:  Usada: %ld de una %ld pila.  Use 'mysqld -O thread_stack=#' para especificar una mayor pila si necesario",
-"Dependencia cruzada encontrada en OUTER JOIN.  Examine su condici<63>n ON",
+"Dependencia cruzada encontrada en OUTER JOIN; examine su condici<63>n ON",
 "Columna '%-.32s' es usada con UNIQUE o INDEX pero no est<73> definida como NOT NULL",
 "No puedo cargar funci<63>n '%-.64s'",
 "No puedo inicializar funci<63>n '%-.64s'; %-.80s",
@@ -257,15 +257,15 @@ character-set=latin1
 "Select %u fu<66> reducido durante optimizaci<63>n",
 "Tabla '%-.64s' de uno de los SELECT no puede ser usada en %-.32s",
 "Cliente no soporta protocolo de autenticaci<63>n solicitado por el servidor; considere actualizar el cliente MySQL",
-"Todas las partes de una SPATIAL KEY deben ser NOT NULL",
+"Todas las partes de una SPATIAL index deben ser NOT NULL",
 "COLLATION '%s' no es v<>lido para CHARACTER SET '%s'",
 "Slave ya est<73> funcionando",
 "Slave ya fu<66> parado",
 "Tama<6D>o demasiado grande para datos descomprimidos. El m<>ximo tama<6D>o es %d. (probablemente, extensi<73>n de datos descomprimidos fu<66> corrompida)",
-"Z_MEM_ERROR: No suficiente memoria para zlib",
+"ZLIB: No suficiente memoria",
-"Z_BUF_ERROR: No suficiente espacio en el b<>fer de salida para zlib (probablemente, extensi<73>n de datos descomprimidos fu<66> corrompida)",
+"ZLIB: No suficiente espacio en el b<>fer de salida (probablemente, extensi<73>n de datos descomprimidos fu<66> corrompida)",
-"Z_DATA_ERROR: Dato de entrada fu<66> corrompido para zlib",
+"ZLIB: Dato de entrada fu<66> corrompido",
-"%d l<>nea(s) fue(fueron) cortadas por group_concat()",
+"%d l<>nea(s) fueron cortadas por GROUP_CONCAT()",
 "L<>nea %ld no contiene datos para todas las columnas",
 "L<>nea %ld fu<66> truncada; La misma contine mas datos que las que existen en las columnas de entrada",
 "Datos truncado, NULL suministrado para NOT NULL columna '%s' en la l<>nea %ld",

sql/share/swedish/errmsg.txt

@@ -255,19 +255,19 @@ character-set=latin1
 "Select %u reducerades vid optimiering",
 "Tabell '%-.64s' fr<66>n en SELECT kan inte anv<6E>ndas i %-.32s",
 "Klienten st<73>der inte autentiseringsprotokollet som beg<65>rts av servern; <20>verv<72>g uppgradering av klientprogrammet.",
-"Alla delar av en SPATIAL KEY m<>ste vara NOT NULL",
+"Alla delar av en SPATIAL index m<>ste vara NOT NULL",
 "COLLATION '%s' <20>r inte till<6C>tet f<>r CHARACTER SET '%s'",
 "Slaven har redan startat",
 "Slaven har redan stoppat",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d rad(er) kapades av group_concat()",
+"%d rad(er) kapades av GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Anv<6E>nder handler %s f<>r tabell '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -275,7 +275,7 @@ character-set=latin1
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -296,8 +296,8 @@ character-set=latin1
 "MySQL <20>r startad med --skip-grant-tables. Pga av detta kan du inte anv<6E>nda detta kommando",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Fick felkod %d '%-.100s' fr<66>n %s",
 "Fick tilf<6C>llig felkod %d '%-.100s' fr<66>n %s",

sql/share/ukrainian/errmsg.txt

@@ -258,21 +258,21 @@ character-set=koi8u
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s)",
 "Every derived table must have its own alias",
 "Select %u was <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD><69><EFBFBD>ii",
-"Table '%-.64s' from one of SELECTs can not be used in %-.32s",
+"Table '%-.64s' from one of the SELECTs cannot be used in %-.32s",
 "Client does not support authentication protocol requested by server; consider upgrading MySQL client",
-"All parts of a SPATIAL KEY must be NOT NULL",
+"All parts of a SPATIAL index must be NOT NULL",
 "COLLATION '%s' is not valid for CHARACTER SET '%s'",
 "Slave is already running",
 "Slave has already been stopped",
 "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)",
-"Z_MEM_ERROR: Not enough memory available for zlib",
+"ZLIB: Not enough memory",
-"Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
-"Z_DATA_ERROR: Input data was corrupted for zlib",
+"ZLIB: Input data corrupted",
-"%d line(s) was(were) cut by group_concat()",
+"%d line(s) were cut by GROUP_CONCAT()",
 "Row %ld doesn't contain data for all columns",
 "Row %ld was truncated; it contained more data than there were input columns",
-"Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
+"Data truncated; NULL supplied to NOT NULL column '%s' at row %ld",
-"Data truncated, out of range for column '%s' at row %ld",
+"Data truncated; out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
 "Using storage engine %s for table '%s'",
 "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",
@@ -280,7 +280,7 @@ character-set=koi8u
 "Can't revoke all privileges, grant for one or more of the requested users",
 "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
 "Illegal mix of collations for operation '%s'",
-"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
 "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started",
 "Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
@@ -301,8 +301,8 @@ character-set=koi8u
 "The MySQL server is running with the %s option so it cannot execute this statement",
 "Column '%-.100s' has duplicated value '%-.64s' in %s"
 "Truncated wrong %-.32s value: '%-.128s'"
-"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
-"Invalid ON UPDATE clause for '%-.64s' field",
+"Invalid ON UPDATE clause for '%-.64s' column",
 "This command is not supported in the prepared statement protocol yet",
 "Got error %d '%-.100s' from %s",
 "Got temporary error %d '%-.100s' from %s",