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/dyncol.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/dyncol.result')
-rw-r--r-- | mysql-test/r/dyncol.result | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result index 70fe6049076..95750d02cda 100644 --- a/mysql-test/r/dyncol.result +++ b/mysql-test/r/dyncol.result @@ -47,7 +47,7 @@ select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS unsigned int)); hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS unsigned int)) 000100010001FFFFFFFFFFFFFF7F Warnings: -Error 1657 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. select hex(COLUMN_CREATE(1, NULL AS int)); hex(COLUMN_CREATE(1, NULL AS int)) 000000 @@ -73,7 +73,7 @@ select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS int)); hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS int)) 000100010000FEFFFFFFFFFFFFFF Warnings: -Error 1657 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. select hex(COLUMN_CREATE(1, NULL AS double)); hex(COLUMN_CREATE(1, NULL AS double)) 000000 @@ -223,7 +223,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as unsigned int) 18446744073709551615 Warnings: -Error 1657 Got overflow when converting '99999999999999999999999999999' to UNSIGNED INT. Value truncated. +Error 1916 Got overflow when converting '99999999999999999999999999999' to UNSIGNED INT. Value truncated. select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as unsigned int); column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as unsigned int) 1000 @@ -231,12 +231,12 @@ select column_get(column_create(1, -1 AS decimal), 1 as unsigned int); column_get(column_create(1, -1 AS decimal), 1 as unsigned int) 0 Warnings: -Error 1657 Got overflow when converting '-1' to UNSIGNED INT. Value truncated. +Error 1916 Got overflow when converting '-1' to UNSIGNED INT. Value truncated. select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as unsigned int); column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as unsigned int) 18446744073709551615 Warnings: -Warning 1657 Got overflow when converting '1e+29' to UNSIGNED INT. Value truncated. +Warning 1916 Got overflow when converting '1e+29' to UNSIGNED INT. Value truncated. select column_get(column_create(1, 999.9 AS double), 1 as unsigned int); column_get(column_create(1, 999.9 AS double), 1 as unsigned int) 1000 @@ -244,12 +244,12 @@ select column_get(column_create(1, -1 AS double), 1 as unsigned int); column_get(column_create(1, -1 AS double), 1 as unsigned int) 0 Warnings: -Warning 1657 Got overflow when converting '-1' to UNSIGNED INT. Value truncated. +Warning 1916 Got overflow when converting '-1' to UNSIGNED INT. Value truncated. select column_get(column_create(1, "1212III" AS char), 1 as unsigned int); column_get(column_create(1, "1212III" AS char), 1 as unsigned int) 1212 Warnings: -Warning 1659 Encountered illegal value '1212III' when converting to UNSIGNED INT +Warning 1918 Encountered illegal value '1212III' when converting to UNSIGNED INT # # column get int # @@ -308,12 +308,12 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as int) 9223372036854775807 Warnings: -Error 1657 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '99999999999999999999999999999' to INT. Value truncated. select column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1 as int); column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1 as int) -9223372036854775808 Warnings: -Error 1657 Got overflow when converting '-99999999999999999999999999999' to INT. Value truncated. +Error 1916 Got overflow when converting '-99999999999999999999999999999' to INT. Value truncated. select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as int); column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as int) 1000 @@ -324,17 +324,17 @@ select column_get(column_create(1, -99999999999999999999999999999 AS double), 1 column_get(column_create(1, -99999999999999999999999999999 AS double), 1 as int) -9223372036854775808 Warnings: -Warning 1657 Got overflow when converting '-1e+29' to INT. Value truncated. +Warning 1916 Got overflow when converting '-1e+29' to INT. Value truncated. select column_get(column_create(1, "-1212III" AS char), 1 as int); column_get(column_create(1, "-1212III" AS char), 1 as int) -1212 Warnings: -Warning 1659 Encountered illegal value '-1212III' when converting to INT +Warning 1918 Encountered illegal value '-1212III' when converting to INT select column_get(column_create(1, "1212III" AS char), 1 as int); column_get(column_create(1, "1212III" AS char), 1 as int) 1212 Warnings: -Warning 1659 Encountered illegal value '1212III' when converting to INT +Warning 1918 Encountered illegal value '1212III' when converting to INT select column_get(COLUMN_CREATE(1, ~0), 1 as signed); column_get(COLUMN_CREATE(1, ~0), 1 as signed) -1 @@ -461,12 +461,12 @@ select column_get(column_create(1, "1223.5aa" AS char), 1 as double); column_get(column_create(1, "1223.5aa" AS char), 1 as double) 1223.5 Warnings: -Warning 1659 Encountered illegal value '1223.5aa' when converting to DOUBLE +Warning 1918 Encountered illegal value '1223.5aa' when converting to DOUBLE select column_get(column_create(1, "aa" AS char), 1 as double); column_get(column_create(1, "aa" AS char), 1 as double) 0 Warnings: -Warning 1659 Encountered illegal value 'aa' when converting to DOUBLE +Warning 1918 Encountered illegal value 'aa' when converting to DOUBLE select column_get(column_create(1, "1223.5555" AS double), 1 as double(5,2)); column_get(column_create(1, "1223.5555" AS double), 1 as double(5,2)) 999.99 @@ -530,12 +530,12 @@ select column_get(column_create(1, "1223.5aa" AS char), 1 as decimal(32,10)); column_get(column_create(1, "1223.5aa" AS char), 1 as decimal(32,10)) 1223.5000000000 Warnings: -Warning 1659 Encountered illegal value '1223.5aa' when converting to DECIMAL +Warning 1918 Encountered illegal value '1223.5aa' when converting to DECIMAL select column_get(column_create(1, "aa" AS char), 1 as decimal(32,10)); column_get(column_create(1, "aa" AS char), 1 as decimal(32,10)) 0.0000000000 Warnings: -Warning 1659 Encountered illegal value 'aa' when converting to DECIMAL +Warning 1918 Encountered illegal value 'aa' when converting to DECIMAL select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as decimal); column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as decimal) 9999999999 @@ -671,17 +671,17 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as d column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as datetime) NULL Warnings: -Warning 1659 Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME select column_get(column_create(1, 9223372036854775807 AS int), 1 as datetime); column_get(column_create(1, 9223372036854775807 AS int), 1 as datetime) NULL Warnings: -Warning 1659 Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME select column_get(column_create(1, -9223372036854775808 AS int), 1 as datetime); column_get(column_create(1, -9223372036854775808 AS int), 1 as datetime) NULL Warnings: -Warning 1659 Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as datetime); column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as datetime) NULL @@ -801,17 +801,17 @@ select column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as d column_get(column_create(1, 18446744073709551615 AS unsigned int), 1 as date) NULL Warnings: -Warning 1659 Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '18446744073709551615' when converting to DATE or DATETIME select column_get(column_create(1, 9223372036854775807 AS int), 1 as date); column_get(column_create(1, 9223372036854775807 AS int), 1 as date) NULL Warnings: -Warning 1659 Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '9223372036854775807' when converting to DATE or DATETIME select column_get(column_create(1, -9223372036854775808 AS int), 1 as date); column_get(column_create(1, -9223372036854775808 AS int), 1 as date) NULL Warnings: -Warning 1659 Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME +Warning 1918 Encountered illegal value '-9223372036854775808' when converting to DATE or DATETIME select column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as date); column_get(column_create(1, 99999999999999999999999999999 AS decimal(32,10)), 1 as date) NULL |