diff options
| author | unknown <guilhem@mysql.com> | 2004-02-28 23:36:41 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-02-28 23:36:41 +0100 |
| commit | 45f39ff1de4ac4b7194ead5be96b6a84c6e0735f (patch) | |
| tree | 372e0ba803d0387040691a324ea57032f0ca2b75 /sql/share/english | |
| parent | 5cb14e1b31c57e2c73909e85a741a71535242d21 (diff) | |
| download | mariadb-git-45f39ff1de4ac4b7194ead5be96b6a84c6e0735f.tar.gz | |
small after-merge fixes (error messages).
include/mysqld_error.h:
more generic error code
mysql-test/r/func_compress.result:
update after message change
mysql-test/r/loaddata.result:
update after message change
mysql-test/r/warnings.result:
update after message change
sql/share/czech/errmsg.txt:
message change
sql/share/danish/errmsg.txt:
message change
sql/share/dutch/errmsg.txt:
message change
sql/share/english/errmsg.txt:
message change
sql/share/estonian/errmsg.txt:
message change
sql/share/french/errmsg.txt:
message change
sql/share/german/errmsg.txt:
message change
sql/share/greek/errmsg.txt:
message change
sql/share/hungarian/errmsg.txt:
message change
sql/share/italian/errmsg.txt:
message change
sql/share/japanese/errmsg.txt:
message change
sql/share/korean/errmsg.txt:
message change
sql/share/norwegian-ny/errmsg.txt:
message change
sql/share/norwegian/errmsg.txt:
message change
sql/share/polish/errmsg.txt:
message change
sql/share/portuguese/errmsg.txt:
message change
sql/share/romanian/errmsg.txt:
message change
sql/share/russian/errmsg.txt:
message change
sql/share/slovak/errmsg.txt:
message change
sql/share/spanish/errmsg.txt:
message change
sql/share/swedish/errmsg.txt:
message change
sql/share/ukrainian/errmsg.txt:
message change
Diffstat (limited to 'sql/share/english')
| -rw-r--r-- | sql/share/english/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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", |