diff options
| author | unknown <guilhem@mysql.com> | 2004-02-28 22:33:47 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-02-28 22:33:47 +0100 |
| commit | 5cb14e1b31c57e2c73909e85a741a71535242d21 (patch) | |
| tree | bed29b216b0ef825921f2747bfacd6b657e0be25 /sql/share | |
| parent | a327ff8f7fd6f03ca1418e8287886652c5e22189 (diff) | |
| parent | 57659a4dafded65807472efcb3475e3b9217f4ce (diff) | |
| download | mariadb-git-5cb14e1b31c57e2c73909e85a741a71535242d21.tar.gz | |
temporary undo needed for merge
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
include/mysqld_error.h:
for merge
mysql-test/r/loaddata.result:
for merge
mysql-test/r/warnings.result:
for merge
sql/share/czech/errmsg.txt:
for merge
sql/share/danish/errmsg.txt:
for merge
sql/share/dutch/errmsg.txt:
for merge
sql/share/english/errmsg.txt:
for merge
sql/share/estonian/errmsg.txt:
for merge
sql/share/french/errmsg.txt:
for merge
sql/share/german/errmsg.txt:
for merge
sql/share/greek/errmsg.txt:
for merge
sql/share/hungarian/errmsg.txt:
for merge
sql/share/italian/errmsg.txt:
for merge
sql/share/japanese/errmsg.txt:
for merge
sql/share/korean/errmsg.txt:
for merge
sql/share/norwegian-ny/errmsg.txt:
for merge
sql/share/norwegian/errmsg.txt:
for merge
sql/share/polish/errmsg.txt:
for merge
sql/share/portuguese/errmsg.txt:
for merge
sql/share/romanian/errmsg.txt:
for merge
sql/share/russian/errmsg.txt:
for merge
sql/share/slovak/errmsg.txt:
for merge
sql/share/spanish/errmsg.txt:
for merge
sql/share/swedish/errmsg.txt:
for merge
sql/share/ukrainian/errmsg.txt:
for merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/serbian/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt index 2090078a7a1..ce27a58ac63 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 cannot execute this statement" |