diff options
| author | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
| commit | 99e0ae85c7bb983202e70e5f67d4b4d383b44a80 (patch) | |
| tree | 00894c28662192eed25fdacc555298265a2880ac /sql/share/spanish | |
| parent | 7fdf6740c74cf153dd10a62876119e9ac11fbc41 (diff) | |
| parent | c49773237d2bb807e10ffb66c321f87a20f1e1c6 (diff) | |
| download | mariadb-git-99e0ae85c7bb983202e70e5f67d4b4d383b44a80.tar.gz | |
Merge 4.1 to 5.0.
Diffstat (limited to 'sql/share/spanish')
| -rw-r--r-- | sql/share/spanish/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 9acc80a2211..cdabd339e1e 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -265,8 +265,8 @@ character-set=latin1 "Z_BUF_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)", "Z_DATA_ERROR: Input data was corrupted for zlib", "%d line(s) was(were) cut by group_concat()", -"Record count is fewer than the column count at row %ld", -"Record count is more than the column count at row %ld", +"Row %ld doesn't contain data for all columns", +"Row %ld was truncated; It contained more data than there where 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", |