Language/consistency edits to error messages.

23 files changed, 111 insertions, 111 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index e33c0c3c7f5..9d8e45b5f32 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -320,10 +320,10 @@ character-set=latin2
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -347,6 +347,6 @@ character-set=latin2
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index a3c45764a67..6a572c96ec3 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -314,10 +314,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -341,6 +341,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index dedde848eb2..b9be9263210 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -322,10 +322,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -349,6 +349,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 1e948fd0e45..0939537a73b 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -311,10 +311,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 709b7161179..03862a8a9cf 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -316,10 +316,10 @@ character-set=latin7
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -343,6 +343,6 @@ character-set=latin7
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 10e670321a3..df88418ce26 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -311,10 +311,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 3bcc531893b..7e5afb53c23 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -323,10 +323,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s, expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -350,6 +350,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 6a1d4319e60..28bad796aa1 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -311,10 +311,10 @@ character-set=greek
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=greek
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index b460edba549..110bb6dd720 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -313,10 +313,10 @@ character-set=latin2
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -340,6 +340,6 @@ character-set=latin2
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 83acf80a559..4b492424572 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -311,10 +311,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 7e3cc352abc..4f72e11b776 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -313,10 +313,10 @@ character-set=ujis
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -340,6 +340,6 @@ character-set=ujis
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 2296bc543e9..dd499200f61 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -311,10 +311,10 @@ character-set=euckr
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=euckr
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 944f5ff3599..9a35de1e64d 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -313,10 +313,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -340,6 +340,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index e50276c6197..1104eba015d 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -313,10 +313,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -340,6 +340,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 8210018756d..b0b23581e0a 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -315,10 +315,10 @@ character-set=latin2
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -342,6 +342,6 @@ character-set=latin2
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index d1ab9ae2812..8807a0d3fdb 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -312,10 +312,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -339,6 +339,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index d42ced27c35..2ffdf18af12 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -315,10 +315,10 @@ character-set=latin2
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -342,6 +342,6 @@ character-set=latin2
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index a1a69b6b8e2..560a58c5f9b 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -313,10 +313,10 @@ character-set=koi8r
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 284a28e830f..d6343655992 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -305,10 +305,10 @@ character-set=cp1250
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -332,6 +332,6 @@ character-set=cp1250
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index ca68d08ce61..ebd64bb94ab 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -319,10 +319,10 @@ character-set=latin2
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -346,6 +346,6 @@ character-set=latin2
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 71ec30f6338..4a38494c57d 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -313,10 +313,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -340,6 +340,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index c8fa873c61c..6ae7dc8a874 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -311,10 +311,10 @@ character-set=latin1
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"
@@ -338,6 +338,6 @@ character-set=latin1
 "Case not found for CASE statement"
 "Configuration file '%-.64s' is too big"
 "Malformed file type header in file '%-.64s'"
-"Unexpected end of file during parsing comment '%-.64s'"
+"Unexpected end of file while parsing comment '%-.64s'"
 "Error during parsing parameter '%-.64s' (line: '%-.64s')"
-"Unexpected end of file during skipping unknown parameter '%-.64s'"
+"Unexpected end of file while skipping unknown parameter '%-.64s'"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index d106eee3cf8..9e137beac8e 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -316,10 +316,10 @@ character-set=koi8u
 "SELECT in a stored procedure must have INTO"
 "RETURN is only allowed in a FUNCTION"
 "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION"
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored."
-"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN."
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
+"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
 "Query execution was interrupted"
-"Wrong number of arguments for %s %s, expected %u, got %u"
+"Incorrect number of arguments for %s %s; expected %u, got %u"
 "Undefined CONDITION: %s"
 "No RETURN found in FUNCTION %s"
 "FUNCTION %s ended without RETURN"