diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/bigint.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/dyncol.result | 44 | ||||
| -rw-r--r-- | mysql-test/r/func_math.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_str.result | 250 | ||||
| -rw-r--r-- | mysql-test/r/plugin.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/table_options.result | 46 | ||||
| -rw-r--r-- | mysql-test/r/type_newdecimal.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
8 files changed, 185 insertions, 185 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 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 diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 37337daf212..8115c6a0300 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -516,7 +516,7 @@ SELECT -9999999999999999991 DIV -1; -9999999999999999991 DIV -1 -9223372036854775808 Warnings: -Error 1657 Got overflow when converting '-9999999999999999991' to INT. Value truncated. +Error 1916 Got overflow when converting '-9999999999999999991' to INT. Value truncated. SELECT -9223372036854775808 DIV -1; -9223372036854775808 DIV -1 -9223372036854775808 diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index e47d3a9b540..f23026096a5 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1533,7 +1533,7 @@ select locate('lo','hello',-18446744073709551615); locate('lo','hello',-18446744073709551615) 0 Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select locate('lo','hello',18446744073709551615); locate('lo','hello',18446744073709551615) 0 @@ -1541,22 +1541,22 @@ select locate('lo','hello',-18446744073709551616); locate('lo','hello',-18446744073709551616) 0 Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select locate('lo','hello',18446744073709551616); locate('lo','hello',18446744073709551616) 0 Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select locate('lo','hello',-18446744073709551617); locate('lo','hello',-18446744073709551617) 0 Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select locate('lo','hello',18446744073709551617); locate('lo','hello',18446744073709551617) 0 Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select left('hello', 10); left('hello', 10) hello @@ -1588,8 +1588,8 @@ select left('hello', -18446744073709551615); left('hello', -18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select left('hello', 18446744073709551615); left('hello', 18446744073709551615) hello @@ -1597,26 +1597,26 @@ select left('hello', -18446744073709551616); left('hello', -18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select left('hello', 18446744073709551616); left('hello', 18446744073709551616) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select left('hello', -18446744073709551617); left('hello', -18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select left('hello', 18446744073709551617); left('hello', 18446744073709551617) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select right('hello', 10); right('hello', 10) hello @@ -1648,8 +1648,8 @@ select right('hello', -18446744073709551615); right('hello', -18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select right('hello', 18446744073709551615); right('hello', 18446744073709551615) hello @@ -1657,26 +1657,26 @@ select right('hello', -18446744073709551616); right('hello', -18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select right('hello', 18446744073709551616); right('hello', 18446744073709551616) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select right('hello', -18446744073709551617); right('hello', -18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select right('hello', 18446744073709551617); right('hello', 18446744073709551617) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select substring('hello', 2, -1); substring('hello', 2, -1) @@ -1708,8 +1708,8 @@ select substring('hello', -18446744073709551615, 1); substring('hello', -18446744073709551615, 1) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select substring('hello', 18446744073709551615, 1); substring('hello', 18446744073709551615, 1) @@ -1717,26 +1717,26 @@ select substring('hello', -18446744073709551616, 1); substring('hello', -18446744073709551616, 1) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select substring('hello', 18446744073709551616, 1); substring('hello', 18446744073709551616, 1) Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select substring('hello', -18446744073709551617, 1); substring('hello', -18446744073709551617, 1) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select substring('hello', 18446744073709551617, 1); substring('hello', 18446744073709551617, 1) Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select substring('hello', 1, -1); substring('hello', 1, -1) @@ -1762,8 +1762,8 @@ select substring('hello', 1, -18446744073709551615); substring('hello', 1, -18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select substring('hello', 1, 18446744073709551615); substring('hello', 1, 18446744073709551615) hello @@ -1771,26 +1771,26 @@ select substring('hello', 1, -18446744073709551616); substring('hello', 1, -18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select substring('hello', 1, 18446744073709551616); substring('hello', 1, 18446744073709551616) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select substring('hello', 1, -18446744073709551617); substring('hello', 1, -18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select substring('hello', 1, 18446744073709551617); substring('hello', 1, 18446744073709551617) hello Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select substring('hello', -1, -1); substring('hello', -1, -1) @@ -1816,10 +1816,10 @@ select substring('hello', -18446744073709551615, -18446744073709551615); substring('hello', -18446744073709551615, -18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select substring('hello', 18446744073709551615, 18446744073709551615); substring('hello', 18446744073709551615, 18446744073709551615) @@ -1827,34 +1827,34 @@ select substring('hello', -18446744073709551616, -18446744073709551616); substring('hello', -18446744073709551616, -18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select substring('hello', 18446744073709551616, 18446744073709551616); substring('hello', 18446744073709551616, 18446744073709551616) Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select substring('hello', -18446744073709551617, -18446744073709551617); substring('hello', -18446744073709551617, -18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select substring('hello', 18446744073709551617, 18446744073709551617); substring('hello', 18446744073709551617, 18446744073709551617) Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select insert('hello', -1, 1, 'hi'); insert('hello', -1, 1, 'hi') hello @@ -1880,7 +1880,7 @@ select insert('hello', -18446744073709551615, 1, 'hi'); insert('hello', -18446744073709551615, 1, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select insert('hello', 18446744073709551615, 1, 'hi'); insert('hello', 18446744073709551615, 1, 'hi') hello @@ -1888,22 +1888,22 @@ select insert('hello', -18446744073709551616, 1, 'hi'); insert('hello', -18446744073709551616, 1, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select insert('hello', 18446744073709551616, 1, 'hi'); insert('hello', 18446744073709551616, 1, 'hi') hello Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select insert('hello', -18446744073709551617, 1, 'hi'); insert('hello', -18446744073709551617, 1, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select insert('hello', 18446744073709551617, 1, 'hi'); insert('hello', 18446744073709551617, 1, 'hi') hello Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select insert('hello', 1, -1, 'hi'); insert('hello', 1, -1, 'hi') hi @@ -1929,7 +1929,7 @@ select insert('hello', 1, -18446744073709551615, 'hi'); insert('hello', 1, -18446744073709551615, 'hi') hi Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select insert('hello', 1, 18446744073709551615, 'hi'); insert('hello', 1, 18446744073709551615, 'hi') hi @@ -1937,22 +1937,22 @@ select insert('hello', 1, -18446744073709551616, 'hi'); insert('hello', 1, -18446744073709551616, 'hi') hi Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select insert('hello', 1, 18446744073709551616, 'hi'); insert('hello', 1, 18446744073709551616, 'hi') hi Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select insert('hello', 1, -18446744073709551617, 'hi'); insert('hello', 1, -18446744073709551617, 'hi') hi Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select insert('hello', 1, 18446744073709551617, 'hi'); insert('hello', 1, 18446744073709551617, 'hi') hi Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select insert('hello', -1, -1, 'hi'); insert('hello', -1, -1, 'hi') hello @@ -1978,8 +1978,8 @@ select insert('hello', -18446744073709551615, -18446744073709551615, 'hi'); insert('hello', -18446744073709551615, -18446744073709551615, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select insert('hello', 18446744073709551615, 18446744073709551615, 'hi'); insert('hello', 18446744073709551615, 18446744073709551615, 'hi') hello @@ -1987,26 +1987,26 @@ select insert('hello', -18446744073709551616, -18446744073709551616, 'hi'); insert('hello', -18446744073709551616, -18446744073709551616, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select insert('hello', 18446744073709551616, 18446744073709551616, 'hi'); insert('hello', 18446744073709551616, 18446744073709551616, 'hi') hello Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. select insert('hello', -18446744073709551617, -18446744073709551617, 'hi'); insert('hello', -18446744073709551617, -18446744073709551617, 'hi') hello Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select insert('hello', 18446744073709551617, 18446744073709551617, 'hi'); insert('hello', 18446744073709551617, 18446744073709551617, 'hi') hello Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. select repeat('hello', -1); repeat('hello', -1) @@ -2038,8 +2038,8 @@ select repeat('hello', -18446744073709551615); repeat('hello', -18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select repeat('hello', 18446744073709551615); repeat('hello', 18446744073709551615) NULL @@ -2049,27 +2049,27 @@ select repeat('hello', -18446744073709551616); repeat('hello', -18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select repeat('hello', 18446744073709551616); repeat('hello', 18446744073709551616) NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. Warning 1301 Result of repeat() was larger than max_allowed_packet (1048576) - truncated select repeat('hello', -18446744073709551617); repeat('hello', -18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select repeat('hello', 18446744073709551617); repeat('hello', 18446744073709551617) NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. Warning 1301 Result of repeat() was larger than max_allowed_packet (1048576) - truncated select space(-1); space(-1) @@ -2102,8 +2102,8 @@ select space(-18446744073709551615); space(-18446744073709551615) Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select space(18446744073709551615); space(18446744073709551615) NULL @@ -2113,27 +2113,27 @@ select space(-18446744073709551616); space(-18446744073709551616) Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select space(18446744073709551616); space(18446744073709551616) NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. Warning 1301 Result of repeat() was larger than max_allowed_packet (1048576) - truncated select space(-18446744073709551617); space(-18446744073709551617) Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select space(18446744073709551617); space(18446744073709551617) NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. Warning 1301 Result of repeat() was larger than max_allowed_packet (1048576) - truncated select rpad('hello', -1, '1'); rpad('hello', -1, '1') @@ -2166,8 +2166,8 @@ select rpad('hello', -18446744073709551615, '1'); rpad('hello', -18446744073709551615, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select rpad('hello', 18446744073709551615, '1'); rpad('hello', 18446744073709551615, '1') NULL @@ -2177,27 +2177,27 @@ select rpad('hello', -18446744073709551616, '1'); rpad('hello', -18446744073709551616, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select rpad('hello', 18446744073709551616, '1'); rpad('hello', 18446744073709551616, '1') NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. Warning 1301 Result of rpad() was larger than max_allowed_packet (1048576) - truncated select rpad('hello', -18446744073709551617, '1'); rpad('hello', -18446744073709551617, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select rpad('hello', 18446744073709551617, '1'); rpad('hello', 18446744073709551617, '1') NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. Warning 1301 Result of rpad() was larger than max_allowed_packet (1048576) - truncated select lpad('hello', -1, '1'); lpad('hello', -1, '1') @@ -2230,8 +2230,8 @@ select lpad('hello', -18446744073709551615, '1'); lpad('hello', -18446744073709551615, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551615' to INT. Value truncated. select lpad('hello', 18446744073709551615, '1'); lpad('hello', 18446744073709551615, '1') NULL @@ -2241,27 +2241,27 @@ select lpad('hello', -18446744073709551616, '1'); lpad('hello', -18446744073709551616, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551616' to INT. Value truncated. select lpad('hello', 18446744073709551616, '1'); lpad('hello', 18446744073709551616, '1') NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551616' to INT. Value truncated. Warning 1301 Result of lpad() was larger than max_allowed_packet (1048576) - truncated select lpad('hello', -18446744073709551617, '1'); lpad('hello', -18446744073709551617, '1') NULL Warnings: -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '-18446744073709551617' to INT. Value truncated. select lpad('hello', 18446744073709551617, '1'); lpad('hello', 18446744073709551617, '1') NULL Warnings: -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. -Error 1657 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. +Error 1916 Got overflow when converting '18446744073709551617' to INT. Value truncated. Warning 1301 Result of lpad() was larger than max_allowed_packet (1048576) - truncated SET @orig_sql_mode = @@SQL_MODE; SET SQL_MODE=traditional; diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 98be0326ef0..f31d1bd530b 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -75,9 +75,9 @@ SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; #illegal value fixed CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS; Warnings: -Warning 1653 Incorrect value '10000000000000000000' for option 'ULL' -Warning 1653 Incorrect value 'ttt' for option 'one_or_two' -Warning 1653 Incorrect value 'SSS' for option 'YESNO' +Warning 1912 Incorrect value '10000000000000000000' for option 'ULL' +Warning 1912 Incorrect value 'ttt' for option 'one_or_two' +Warning 1912 Incorrect value 'SSS' for option 'YESNO' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/r/table_options.result b/mysql-test/r/table_options.result index ddb7bd13c03..164fe4e30d0 100644 --- a/mysql-test/r/table_options.result +++ b/mysql-test/r/table_options.result @@ -3,9 +3,9 @@ SET @OLD_SQL_MODE=@@SQL_MODE; SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1='1v1'; Warnings: -Warning 1652 Unknown option 'fkey' -Warning 1652 Unknown option 'dff' -Warning 1652 Unknown option 'tkey1' +Warning 1911 Unknown option 'fkey' +Warning 1911 Unknown option 'dff' +Warning 1911 Unknown option 'tkey1' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -16,10 +16,10 @@ drop table t1; #reassiginig options in the same line create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1 TKEY1=DEFAULT tkey1=1v2 tkey2=2v1; Warnings: -Warning 1652 Unknown option 'fkey' -Warning 1652 Unknown option 'dff' -Warning 1652 Unknown option 'tkey1' -Warning 1652 Unknown option 'tkey2' +Warning 1911 Unknown option 'fkey' +Warning 1911 Unknown option 'dff' +Warning 1911 Unknown option 'tkey1' +Warning 1911 Unknown option 'tkey2' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -29,7 +29,7 @@ t1 CREATE TABLE `t1` ( #add option alter table t1 tkey4=4v1; Warnings: -Warning 1652 Unknown option 'tkey4' +Warning 1911 Unknown option 'tkey4' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -39,8 +39,8 @@ t1 CREATE TABLE `t1` ( #remove options alter table t1 tkey3=DEFAULT tkey4=DEFAULT; Warnings: -Warning 1652 Unknown option 'tkey3' -Warning 1652 Unknown option 'tkey4' +Warning 1911 Unknown option 'tkey3' +Warning 1911 Unknown option 'tkey4' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -50,11 +50,11 @@ t1 CREATE TABLE `t1` ( drop table t1; create table t1 (a int fkey1=v1, key akey (a) kkey1=v1) tkey1=1v1 tkey1=1v2 TKEY1=DEFAULT tkey2=2v1 tkey3=3v1; Warnings: -Warning 1652 Unknown option 'fkey1' -Warning 1652 Unknown option 'kkey1' -Warning 1652 Unknown option 'TKEY1' -Warning 1652 Unknown option 'tkey2' -Warning 1652 Unknown option 'tkey3' +Warning 1911 Unknown option 'fkey1' +Warning 1911 Unknown option 'kkey1' +Warning 1911 Unknown option 'TKEY1' +Warning 1911 Unknown option 'tkey2' +Warning 1911 Unknown option 'tkey3' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -64,7 +64,7 @@ t1 CREATE TABLE `t1` ( #change field with option with the same value alter table t1 change a a int `FKEY1`='v1'; Warnings: -Warning 1652 Unknown option 'FKEY1' +Warning 1911 Unknown option 'FKEY1' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -74,7 +74,7 @@ t1 CREATE TABLE `t1` ( #change field with option with a different value alter table t1 change a a int fkey1=v2; Warnings: -Warning 1652 Unknown option 'fkey1' +Warning 1911 Unknown option 'fkey1' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -93,7 +93,7 @@ t1 CREATE TABLE `t1` ( #new key with options alter table t1 add key bkey (b) kkey2=v1; Warnings: -Warning 1652 Unknown option 'kkey2' +Warning 1911 Unknown option 'kkey2' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -105,8 +105,8 @@ t1 CREATE TABLE `t1` ( #new column with options alter table t1 add column c int fkey1=v1 fkey2=v2; Warnings: -Warning 1652 Unknown option 'fkey1' -Warning 1652 Unknown option 'fkey2' +Warning 1911 Unknown option 'fkey1' +Warning 1911 Unknown option 'fkey2' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -141,7 +141,7 @@ t1 CREATE TABLE `t1` ( #add column with options after delete alter table t1 add column b int fkey2=v1; Warnings: -Warning 1652 Unknown option 'fkey2' +Warning 1911 Unknown option 'fkey2' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -154,7 +154,7 @@ t1 CREATE TABLE `t1` ( #add key alter table t1 add key bkey (b) kkey2=v2; Warnings: -Warning 1652 Unknown option 'kkey2' +Warning 1911 Unknown option 'kkey2' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -168,7 +168,7 @@ t1 CREATE TABLE `t1` ( drop table t1; create table t1 (a int) tkey1=100; Warnings: -Warning 1652 Unknown option 'tkey1' +Warning 1911 Unknown option 'tkey1' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result index 199dd95d32b..5d4c66bad32 100644 --- a/mysql-test/r/type_newdecimal.result +++ b/mysql-test/r/type_newdecimal.result @@ -838,12 +838,12 @@ select 9999999999999999999999999999999999999999999999999999999999999999999999999 x 99999999999999999999999999999999999999999999999999999999999999999 Warnings: -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 1 as x; x 100000000000000000000000000000000000000000000000000000000000000000 Warnings: -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. select 0.190287977636363637 + 0.040372670 * 0 - 0; 0.190287977636363637 + 0.040372670 * 0 - 0 0.190287977636363637 @@ -1380,15 +1380,15 @@ create table t1 (c1 decimal(64)); insert into t1 values( 89000000000000000000000000000000000000000000000000000000000000000000000000000000000000000); Warnings: -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. Warning 1264 Out of range value for column 'c1' at row 1 insert into t1 values( 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 * 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999); Warnings: -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. Warning 1264 Out of range value for column 'c1' at row 1 insert into t1 values(1e100); Warnings: @@ -1432,7 +1432,7 @@ select cast(19999999999999999999 as unsigned); cast(19999999999999999999 as unsigned) 18446744073709551615 Warnings: -Error 1657 Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated. +Error 1916 Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated. create table t1(a decimal(18)); insert into t1 values(123456789012345678); alter table t1 modify column a decimal(19); @@ -1674,7 +1674,7 @@ CREATE TABLE t1 SELECT /* 82 */ 1000000000000000000000000000000000000000000000000000000000000000000000000000000001 AS c1; Warnings: -Error 1657 Got overflow when converting '' to DECIMAL. Value truncated. +Error 1916 Got overflow when converting '' to DECIMAL. Value truncated. DESC t1; Field Type Null Key Default Extra c1 decimal(65,0) NO 0 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); |