summaryrefslogtreecommitdiff
path: root/sql/share/greek
diff options
context:
space:
mode:
authorunknown <paul@teton.kitebird.com>2004-03-01 14:35:52 -0600
committerunknown <paul@teton.kitebird.com>2004-03-01 14:35:52 -0600
commit8bdada3e44289789b076350198cccafb6b2de91b (patch)
tree129a7553f33a79b01f599cf2da67c2c4ca0c3383 /sql/share/greek
parenta1def0c2ab2d8a910b9b0759eb7bff58aa2afc72 (diff)
parent722e0ec37827de7fc8bc17030cac43a9f27c35d7 (diff)
downloadmariadb-git-8bdada3e44289789b076350198cccafb6b2de91b.tar.gz
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
Diffstat (limited to 'sql/share/greek')
-rw-r--r--sql/share/greek/errmsg.txt4
1 files changed, 2 insertions, 2 deletions
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",