Language/consistency edits to error messages

and affected test results.

34 files changed, 211 insertions, 211 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index a7c1dbde697..a8f540af0a2 100644
--- a/mysql-test/r/alter_table.result
+++ b/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;
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index 66b24248cf9..97bf835a9d2 100644
--- a/mysql-test/r/auto_increment.result
+++ b/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
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 2cbbdda95a6..699485ff3f7 100644
--- a/mysql-test/r/create.result
+++ 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;
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 7442a156816..7e6b9b44566 100644
--- a/mysql-test/r/derived.result
+++ b/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)
 );
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index d0765e2721f..6f341e12344 100644
--- a/mysql-test/r/grant2.result
+++ b/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'
diff --git a/mysql-test/r/grant_cache.result b/mysql-test/r/grant_cache.result
index 3020b281f80..b890f2e454e 100644
--- a/mysql-test/r/grant_cache.result
+++ b/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
diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result
index 761d58abbad..f66e9f1759d 100644
--- a/mysql-test/r/handler.result
+++ b/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;
diff --git a/mysql-test/r/innodb_handler.result b/mysql-test/r/innodb_handler.result
index 32a38f17736..7f4960ffa35 100644
--- a/mysql-test/r/innodb_handler.result
+++ b/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;
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 782a71e83d1..71b10699fa9 100644
--- a/mysql-test/r/insert.result
+++ b/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_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_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' 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_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
 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_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_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_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' 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_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_double_15_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_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_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' 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_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
 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_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_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_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' 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_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_double_15_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_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_float_3_1_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_double_15_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
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 2e90f8b2d81..7c7ac152aa5 100644
--- a/mysql-test/r/insert_select.result
+++ b/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 2
+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
 select * from t2;
 No	Field	Count
 0	1	100
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index f9e49c40dc1..db9b051a58f 100644
--- a/mysql-test/r/join.result
+++ b/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,
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 9d7c3d98952..d6f2b7a72d8 100644
--- a/mysql-test/r/join_outer.result
+++ b/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));
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index 28824de94ce..9b4621edc42 100644
--- a/mysql-test/r/key.result
+++ b/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 2
+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
 SELECT * FROM t1;
 c	i
 	1
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 1580f51975e..fe8708f882d 100644
--- a/mysql-test/r/key_cache.result
+++ b/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
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
index d8c70625e35..b4b78dc4b5b 100644
--- a/mysql-test/r/multi_update.result
+++ b/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;
diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/r/ndb_replace.result
index 7c10101ff2e..45af0f7fcb5 100644
--- a/mysql-test/r/ndb_replace.result
+++ b/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
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index 7391f4192bf..1d76fbf2fb3 100644
--- a/mysql-test/r/null.result
+++ b/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 2
+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
 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 2
+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
 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 2
+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
 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 2
+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
 select * from t1;
 a	b	c	d
 	0	0000-00-00 00:00:00	0
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result
index e57ac321f46..4b7400e5e60 100644
--- a/mysql-test/r/null_key.result
+++ b/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
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index 4cf6bee6123..a87d0c33559 100644
--- a/mysql-test/r/openssl_1.result
+++ b/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;
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 3a086332ff8..fd3a7d54b4d 100644
--- a/mysql-test/r/ps.result
+++ b/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;
diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
index 6bffdd85aa4..766ee8c0e14 100644
--- a/mysql-test/r/select_safe.result
+++ b/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
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 86a90d553da..653a8e7302e 100644
--- a/mysql-test/r/show_check.result
+++ 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 
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index d4270ecfd05..202219d04cf 100644
--- a/mysql-test/r/subselect.result
+++ b/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);
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index 6792f2f4c2c..580fc9a8d0b 100644
--- a/mysql-test/r/type_blob.result
+++ b/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;
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
index 66eb744e7ce..8e86ce990b1 100644
--- a/mysql-test/r/type_datetime.result
+++ b/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 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 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 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 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 18
 select * from t1;
 t
 2000-01-01 00:00:00
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index dc78369f583..e39c4c2b132 100644
--- a/mysql-test/r/type_decimal.result
+++ b/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 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 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 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 6
+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
 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 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 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 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 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 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 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 6
+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
 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 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 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 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 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 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 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 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 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 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 3
+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
 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 7
+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
 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 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 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 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 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 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 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 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 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 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;
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index f044ced2342..30de1e62df7 100644
--- a/mysql-test/r/type_float.result
+++ b/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 8
+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
 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
diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result
index 8d80f342c1c..e803fde14a6 100644
--- a/mysql-test/r/type_ranges.result
+++ b/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 '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 'ulong' 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 'umedium' 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 '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 '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 '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 'ulong' 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 '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 '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 'umedium' 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 '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 '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 '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 '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 '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 '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 '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;
diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result
index 315b93c5baf..c4e1b33bb99 100644
--- a/mysql-test/r/type_time.result
+++ b/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 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 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 4
 Note	1292	Truncated incorrect time value: '12.45a'
 select * from t1;
 t
diff --git a/mysql-test/r/type_uint.result b/mysql-test/r/type_uint.result
index f312e9b7f64..07eb47faa7c 100644
--- a/mysql-test/r/type_uint.result
+++ b/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
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 4284ed0fd62..da4915294b1 100644
--- a/mysql-test/r/union.result
+++ b/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
diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result
index 26ce91286da..ab5779859ae 100644
--- a/mysql-test/r/varbinary.result
+++ b/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;
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5ca326d5266..41ea95cf933 100644
--- a/mysql-test/r/variables.result
+++ b/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
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index bb41fc7ce02..d883feb7ce2 100644
--- a/mysql-test/r/warnings.result
+++ b/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	1264	Data truncated, out of range for column 'b' at row 2
+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	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 'b' 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	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: