Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into teton.kitebird.com:/home/paul/mysql-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

23 files changed, 47 insertions, 47 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index d0d5b8a584f..074aa71fb4e 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -274,7 +274,7 @@ character-set=latin2
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -302,4 +302,4 @@ character-set=latin2
 "'%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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 9178441fa1a..eef22418fe6 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -268,7 +268,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -296,4 +296,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index d6311775ef3..7b9eeb5f7f9 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -276,7 +276,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -304,4 +304,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 49d74165dbd..c1ed2ec050c 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -260,12 +260,12 @@ character-set=latin1
 "Slave is already running",
 "Slave has already been stopped",
 "Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)",
-"ZLIB: Not enough memory available for zlib",
-"ZLIB: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)",
-"ZLIB: Input data was corrupted for zlib",
+"ZLIB: Not enough memory",
+"ZLIB: Not enough room in the output buffer (probably, length of uncompressed data was corrupted)",
+"ZLIB: Input data corrupted",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -293,4 +293,4 @@ character-set=latin1
 "'%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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index d898a045877..5b2a8bd5edb 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -270,7 +270,7 @@ character-set=latin7
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -298,4 +298,4 @@ character-set=latin7
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 1f8e5378783..a0f8926c5a8 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -265,7 +265,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -293,4 +293,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 7f35e35de9c..12e0b7d1cd2 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -305,4 +305,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index c1891abe34a..f2e3fe617a3 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -265,7 +265,7 @@ character-set=greek
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -293,4 +293,4 @@ character-set=greek
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 698f1dfa8f8..bf2d1d6316c 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -267,7 +267,7 @@ character-set=latin2
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=latin2
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 2b7f0ce5935..8a70fdb09e5 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -265,7 +265,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -293,4 +293,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 12fdc8d2ed0..e3589fdd287 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -267,7 +267,7 @@ character-set=ujis
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=ujis
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 3cba9d0510f..1857aca10ff 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -265,7 +265,7 @@ character-set=euckr
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -293,4 +293,4 @@ character-set=euckr
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 2734d37a753..3959f270012 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -267,7 +267,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 1c51673ed91..96aeb9cdae6 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -267,7 +267,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index c03b84656ee..5994a5e0b0f 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -269,7 +269,7 @@ character-set=latin2
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,6 +295,6 @@ character-set=latin2
 "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 updateble",
+"The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 7bccddc04a8..2ebee11237d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -294,4 +294,4 @@ character-set=latin1
 "'%s' И desatualizado. Use '%s' em seu lugar",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 4b230279bf9..7e1dcb9eddd 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -269,7 +269,7 @@ character-set=latin2
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -297,4 +297,4 @@ character-set=latin2
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 4282c5326af..cd32d591712 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -267,7 +267,7 @@ character-set=koi8r
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=koi8r
 "'%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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index ea1b200aa32..58d8db4df13 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -259,7 +259,7 @@ character-set=cp1250
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; it contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -287,4 +287,4 @@ character-set=cp1250
 "'%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"
+"The MySQL server is running with the %s option so it cannot execute this statement"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 7ab88f44626..78048c9e34b 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -273,7 +273,7 @@ character-set=latin2
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -301,4 +301,4 @@ character-set=latin2
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index f2f439cdb4f..f9336272162 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -267,7 +267,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -295,4 +295,4 @@ character-set=latin1
 "'%s' is deprecated, use '%s' instead",
 "The target table %-.100s of the %s is not updateable",
 "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",
+"The MySQL server is running with the %s option so it cannot execute this statement",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 251e4d84d8e..dac3c2d8d10 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -265,7 +265,7 @@ character-set=latin1
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d rad(er) kapades av group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index fa312fcc4b4..1c9101d5173 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -270,7 +270,7 @@ character-set=koi8u
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -298,4 +298,4 @@ character-set=koi8u
 "'%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",
+"The MySQL server is running with the %s option so it cannot execute this statement",