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 /mysql-test/r | |
| 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 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_compress.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/loaddata.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 35c1b6ae93f..61aa1c0a497 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -65,6 +65,6 @@ NULL 50000 NULL Warnings: -Error 1259 ZLIB: Input data was corrupted for zlib +Error 1259 ZLIB: Input data corrupted Error 1256 Too big size of uncompressed data. The maximum size is 1048576. (probably, length of uncompressed data was corrupted) drop table t1; diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 368055fed99..5718397e1ec 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -44,9 +44,9 @@ create table t1 (a int, b char(10)); load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines; Warnings: Warning 1265 Data truncated for column 'a' at row 3 -Warning 1262 Row 3 was truncated; It contained more data than there where input columns +Warning 1262 Row 3 was truncated; It contained more data than there were input columns Warning 1265 Data truncated for column 'a' at row 5 -Warning 1262 Row 5 was truncated; It contained more data than there where input columns +Warning 1262 Row 5 was truncated; It contained more data than there were input columns select * from t1; a b 1 row 1 diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index ae1605c99f4..19d44ab6fea 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -48,7 +48,7 @@ Warning 1265 Data truncated for column 'd' at row 3 Warning 1265 Data truncated for column 'c' at row 4 Warning 1261 Row 5 doesn't contain data for all columns Warning 1265 Data truncated for column 'b' at row 6 -Warning 1262 Row 7 was truncated; It contained more data than there where input columns +Warning 1262 Row 7 was truncated; It contained more data than there were input columns Warning 1264 Data truncated, out of range for column 'a' at row 8 select @@warning_count; @@warning_count |