diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-21 00:46:18 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-21 00:46:18 +0300 |
| commit | f610296d98917908d49dc70d5075ea02ff68243d (patch) | |
| tree | aa77d24c55137d119bfde333df875e52fe4a589b /mysql-test/r/warnings.result | |
| parent | be6d6e1b3eb0d243dfa9f1d0de108069df5774e4 (diff) | |
| download | mariadb-git-f610296d98917908d49dc70d5075ea02ff68243d.tar.gz | |
Changed MariaDB error numbers to start from 1900 to not conflict with MySQL error numbers
extra/comp_err.c:
Allow one to have multiple start-error-numbers in the same error.txt file.
Generate 'empty' error strings for the missing error numbers in the errmsg.sys file
mysql-test/r/bigint.result:
Update results to use new error numbers
mysql-test/r/dyncol.result:
Update results to use new error numbers
mysql-test/r/func_math.result:
Update results to use new error numbers
mysql-test/r/func_str.result:
Update results to use new error numbers
mysql-test/r/plugin.result:
Update results to use new error numbers
mysql-test/r/table_options.result:
Update results to use new error numbers
mysql-test/r/type_newdecimal.result:
Update results to use new error numbers
mysql-test/r/warnings.result:
Update results to use new error numbers
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result:
Update results to use new error numbers
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result:
Update results to use new error numbers
mysql-test/suite/vcol/r/vcol_misc.result:
Update results to use new error numbers
sql/derror.cc:
Ensure we don't read a errmsg.sys with a missing required error message; This change was needed as errmsg.sys may now contain empty error messages between the MySQL and MariaDB error messages.
If error message file didn't exist and we have not read one in the past, don't continue.
Give better error message if the errmsg.sys header has changed.
sql/share/errmsg.txt:
Create new section, starting from 1900, for MariaDB error messages
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 34eb4db00c7..4195e90c128 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -324,7 +324,7 @@ select CAST(a AS DECIMAL(13,5)) FROM (SELECT '' as a) t; CAST(a AS DECIMAL(13,5)) 0.00000 Warnings: -Error 1659 Encountered illegal value '' when converting to DECIMAL +Error 1918 Encountered illegal value '' when converting to DECIMAL Warning 1292 Truncated incorrect DECIMAL value: '' create table t1 (a integer unsigned); insert into t1 values (1),(-1),(0),(-2); |