no dots in the error messages!

--disable-warning in union.test


mysql-test/t/union.test:
  cleanup
sql/share/czech/errmsg.txt:
  no dots in the error messages!
sql/share/danish/errmsg.txt:
  no dots in the error messages!
sql/share/dutch/errmsg.txt:
  no dots in the error messages!
sql/share/english/errmsg.txt:
  no dots in the error messages!
sql/share/estonian/errmsg.txt:
  no dots in the error messages!
sql/share/french/errmsg.txt:
  no dots in the error messages!
sql/share/german/errmsg.txt:
  no dots in the error messages!
sql/share/greek/errmsg.txt:
  no dots in the error messages!
sql/share/hungarian/errmsg.txt:
  no dots in the error messages!
sql/share/italian/errmsg.txt:
  no dots in the error messages!
sql/share/japanese/errmsg.txt:
  no dots in the error messages!
sql/share/korean/errmsg.txt:
  no dots in the error messages!
sql/share/norwegian-ny/errmsg.txt:
  no dots in the error messages!
sql/share/norwegian/errmsg.txt:
  no dots in the error messages!
sql/share/polish/errmsg.txt:
  no dots in the error messages!
sql/share/portuguese/errmsg.txt:
  no dots in the error messages!
sql/share/romanian/errmsg.txt:
  no dots in the error messages!
sql/share/russian/errmsg.txt:
  no dots in the error messages!
sql/share/serbian/errmsg.txt:
  no dots in the error messages!
sql/share/slovak/errmsg.txt:
  no dots in the error messages!
sql/share/spanish/errmsg.txt:
  no dots in the error messages!
sql/share/swedish/errmsg.txt:
  no dots in the error messages!
sql/share/ukrainian/errmsg.txt:
  no dots in the error messages!

23 files changed, 91 insertions, 91 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 917b2259e24..35d7fddf4c7 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -285,7 +285,7 @@ character-set=latin2
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -298,7 +298,7 @@ character-set=latin2
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 591e007f5a6..7dded1e961c 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -279,7 +279,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support, they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -292,7 +292,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 3a0d77187bf..95a9010ea27 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -287,7 +287,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -300,7 +300,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 38ca4966dfe..9632b4e1fd5 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -276,7 +276,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working",
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working",
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index f0882d5602b..46a34dbfd25 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -281,7 +281,7 @@ character-set=latin7
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -294,7 +294,7 @@ character-set=latin7
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index d3c7c3ebde1..ab29cf44a6a 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -276,7 +276,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 48eff8831d5..ac470c826c0 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -301,7 +301,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 1e3c436e3d0..7d88a72faf1 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -276,7 +276,7 @@ character-set=greek
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=greek
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 402933d7ef7..b935413b212 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -278,7 +278,7 @@ character-set=latin2
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=latin2
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index d9be6ebb32d..cfe65c40bbf 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -276,7 +276,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index cc36dd60e85..124863219c4 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -278,7 +278,7 @@ character-set=ujis
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=ujis
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 0bbea735a09..4b51ac04a96 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -276,7 +276,7 @@ character-set=euckr
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=euckr
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 2372e7a9690..3313c8ea045 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -278,7 +278,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index f946e988fb0..0c83f2278f1 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -278,7 +278,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index c6bb914d38c..4f2c6e230c6 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -280,7 +280,7 @@ character-set=latin2
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -293,7 +293,7 @@ character-set=latin2
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 537162fc1d0..d4d47a24d7f 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -291,6 +291,6 @@ character-set=latin1
 "MySQL foi inicializado em modo --skip-name-resolve. VocЙ necesita reincializА-lo sem esta opГЦo para este grant funcionar",
 "Motor de tabela desconhecido '%s'",
 "'%s' И desatualizado. Use '%s' em seu lugar.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 8da92d48883..1721dd4e751 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -280,7 +280,7 @@ character-set=latin2
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -293,7 +293,7 @@ character-set=latin2
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index d5d91deb280..302f755f89f 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -89,7 +89,7 @@ character-set=koi8r
 "Невозможно создать IP-сокет",
 "В таблице '%-.64s' нет такого индекса, как в CREATE INDEX. Создайте таблицу заново",
 "Аргумент разделителя полей - не тот, который ожидался. Обращайтесь к документации",
-"Фиксированный размер записи с полями типа BLOB использовать нельзя. Применяйте 'fields terminated by'.",
+"Фиксированный размер записи с полями типа BLOB использовать нельзя, применяйте 'fields terminated by'",
 "Файл '%-.64s' должен находиться в том же каталоге, что и база данных, или быть общедоступным для чтения",
 "Файл '%-.80s' уже существует",
 "Записей: %ld  Удалено: %ld  Пропущено: %ld  Предупреждений: %ld",
@@ -278,7 +278,7 @@ character-set=koi8r
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Сервер запущен в режиме --secure-auth (безопасной авторизации), но для пользователя '%s@%s' пароль сохранён в старом формате; необходимо обновить формат пароля",
 "Поле или ссылка '%-.64s%s%-.64s%s%-.64s' из SELECTа #%d была найдена в SELECTе #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=koi8r
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"Таблица %-.100s в %s не может изменятся.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"Таблица %-.100s в %s не может изменятся",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 8fa7933b871..2090078a7a1 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -271,7 +271,7 @@ character-set=cp1250
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -284,7 +284,7 @@ character-set=cp1250
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 90fbe450bb1..e0ec6102f4c 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -284,7 +284,7 @@ character-set=latin2
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -297,7 +297,7 @@ character-set=latin2
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 644a5c7a515..cdfa6329b1f 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -278,7 +278,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -291,7 +291,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 22a6cecd773..2f656dd8d99 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -276,7 +276,7 @@ character-set=latin1
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -289,7 +289,7 @@ character-set=latin1
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"The target table %-.100s of the %s is not updatable.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"The target table %-.100s of the %s is not updatable",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 2d4ce67e2e5..77c6e437f5b 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -152,7 +152,7 @@ character-set=koi8u
 "Повноважень не визначено для користувача '%-.32s' з хосту '%-.64s'",
 "%-.16s команда заборонена користувачу: '%-.32s'@'%-.64s' у таблиц╕ '%-.64s'",
 "%-.16s команда заборонена користувачу: '%-.32s'@'%-.64s' для стовбця '%-.64s' у таблиц╕ '%-.64s'",
-"Хибна GRANT/REVOKE команда. Прочитайте документац╕ю стосовно того, як╕ права можна використовувати.",
+"Хибна GRANT/REVOKE команда; прочитайте документац╕ю стосовно того, як╕ права можна використовувати",
 "Аргумент host або user для GRANT задовгий",
 "Таблиця '%-.64s.%-.64s' не ╕сну╓",
 "Повноважень не визначено для користувача '%-.32s' з хосту '%-.64s' для таблиц╕ '%-.64s'",
@@ -281,7 +281,7 @@ character-set=koi8u
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
 "Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
 "Стовбець або посилання '%-.64s%s%-.64s%s%-.64s' ╕з SELECTу #%d було знайдене у SELECT╕ #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
@@ -294,7 +294,7 @@ character-set=koi8u
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"Таблиця %-.100s у %s не може оновлюватись.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"'%s' is deprecated, use '%s' instead",
+"Таблиця %-.100s у %s не може оновлюватись",
+"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working"
 "MySQL is started in --skip-grant-tables mode. You can't use this command"