diff options
26 files changed, 46 insertions, 46 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 494f19aa7bd..e95a35bdc51 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -306,5 +306,5 @@ #define ER_WARN_DEPRECATED_SYNTAX 1287 #define ER_NON_UPDATABLE_TABLE 1288 #define ER_FEATURE_DISABLED 1289 -#define ER_SKIP_GRANT_TABLES 1290 +#define ER_OPTION_PREVENTS_STATEMENT 1290 #define ER_ERROR_MESSAGES 291 diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 35c1b6ae93f..61aa1c0a497 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -65,6 +65,6 @@ NULL 50000 NULL Warnings: -Error 1259 ZLIB: Input data was corrupted for zlib +Error 1259 ZLIB: Input data corrupted Error 1256 Too big size of uncompressed data. The maximum size is 1048576. (probably, length of uncompressed data was corrupted) drop table t1; diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 368055fed99..5718397e1ec 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -44,9 +44,9 @@ create table t1 (a int, b char(10)); load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; Warnings: Warning 1265 Data truncated for column 'a' at row 3 -Warning 1262 Row 3 was truncated; It contained more data than there where input columns +Warning 1262 Row 3 was truncated; It contained more data than there were input columns Warning 1265 Data truncated for column 'a' at row 5 -Warning 1262 Row 5 was truncated; It contained more data than there where input columns +Warning 1262 Row 5 was truncated; It contained more data than there were input columns select * from t1; a b 1 row 1 diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index ae1605c99f4..19d44ab6fea 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -48,7 +48,7 @@ Warning 1265 Data truncated for column 'd' at row 3 Warning 1265 Data truncated for column 'c' at row 4 Warning 1261 Row 5 doesn't contain data for all columns Warning 1265 Data truncated for column 'b' at row 6 -Warning 1262 Row 7 was truncated; It contained more data than there where input columns +Warning 1262 Row 7 was truncated; It contained more data than there were input columns Warning 1264 Data truncated, out of range for column 'a' at row 8 select @@warning_count; @@warning_count diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index 70a32fe8ac4..35684ab9561 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 cannot execute this statement", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index a0067918fd2..fa27c2fb18f 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 cannot execute this statement", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 4941ec5c3b1..b9662ade7e2 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 cannot execute this statement", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 7b2809e77be..10f6296b11f 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -265,7 +265,7 @@ character-set=latin1 "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 cannot execute this statement", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 9c44e82c4fc..5597bfb9671 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 cannot execute this statement", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 1b79323ddbf..2d300e41893 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 cannot execute this statement", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index 53f7c762af0..6ce8ae9dfae 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 cannot execute this statement", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index ead697d6fb0..e435ac065c1 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 cannot execute this statement", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 1cc15e647a2..4adde3f93bf 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 cannot execute this statement", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 09c9577d166..729c54716be 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 cannot execute this statement", diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 11af58c116c..b17d48dd024 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 cannot execute this statement", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 133b1ce68f2..daa0224f0ce 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 cannot execute this statement", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index fa9eed5503c..11f738f2902 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 cannot execute this statement", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index a5afec86b99..a81685f70de 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 cannot execute this statement", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index fca1af7fb04..f997ae2cf69 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", @@ -297,4 +297,4 @@ character-set=latin2 "'%s' is deprecated, use '%s' instead", "The target table %-.100s of the %s is not updateble", "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 cannot execute this statement", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 40d89ccb99c..7c7d22fc84a 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 cannot execute this statement", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index d21e40ef07c..8ec9b0e4b7a 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 cannot execute this statement", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index 3852660bbc3..1901a3f8bd4 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 cannot execute this statement", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index e490ebfd43b..98e5624a66b 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 cannot execute this statement", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index d8af0c461b9..88fd606fd77 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 cannot execute this statement", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index 1ab57a6f6e2..7b9e593ec1e 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 52ce4ca53e2..1051f8f9e3c 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 cannot execute this statement", |