diff options
| author | paul@teton.kitebird.com <> | 2004-03-01 14:35:52 -0600 |
|---|---|---|
| committer | paul@teton.kitebird.com <> | 2004-03-01 14:35:52 -0600 |
| commit | ab82779e89fa976341130d63d88291e3ad2d4e1d (patch) | |
| tree | 129a7553f33a79b01f599cf2da67c2c4ca0c3383 /sql/share/norwegian-ny | |
| parent | fbcb8b950b78b7348d25fe6a5f3b94e58abe482e (diff) | |
| parent | 7f3771bc769a6538ab00aa63d056e9cded4e32b4 (diff) | |
| download | mariadb-git-ab82779e89fa976341130d63d88291e3ad2d4e1d.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
Diffstat (limited to 'sql/share/norwegian-ny')
| -rw-r--r-- | sql/share/norwegian-ny/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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", |