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/bigint.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/bigint.result')
| -rw-r--r-- | mysql-test/r/bigint.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index 2dac5614f9f..ac03f3f924a 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -362,12 +362,12 @@ select cast(19999999999999999999 as signed); cast(19999999999999999999 as signed) 9223372036854775807 Warnings: -Error 1657 Got overflow when converting '19999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '19999999999999999999' to INT. Value truncated. select cast(-19999999999999999999 as signed); cast(-19999999999999999999 as signed) -9223372036854775808 Warnings: -Error 1657 Got overflow when converting '-19999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '-19999999999999999999' to INT. Value truncated. select -9223372036854775808; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr def -9223372036854775808 8 20 20 N 32897 0 63 |