Fixed errors found in buildbot

mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/pbxt/r/func_str.result:
  Updated error numbers
mysql-test/suite/pbxt/r/type_newdecimal.result:
  Updated error numbers
mysql-test/valgrind.supp:
  Added suppression for warning on Work (OpenSuse 11.3 64 bit)

6 files changed, 268 insertions, 258 deletions

diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 875c01d9ffe..64cd7117530 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -945,8 +945,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -960,8 +960,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2595,9 +2595,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2611,9 +2611,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2969,8 +2969,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2984,8 +2984,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -3296,9 +3296,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3314,9 +3314,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 DROP VIEW v1;
 
@@ -3386,9 +3386,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3403,9 +3403,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3422,11 +3422,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	28
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3444,11 +3444,11 @@ NULL	NULL	1
 -1.00	-1
 -3333.33	-3333.3333
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3468,9 +3468,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3485,9 +3485,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3504,11 +3504,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3524,11 +3524,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 DROP VIEW v1;
 
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index a00e17d49ed..c31362814be 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -946,8 +946,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -961,8 +961,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2596,9 +2596,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2612,9 +2612,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2970,8 +2970,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2985,8 +2985,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -3297,9 +3297,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3315,9 +3315,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 DROP VIEW v1;
 
@@ -3387,9 +3387,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3404,9 +3404,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3423,11 +3423,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	28
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3445,11 +3445,11 @@ NULL	NULL	1
 -1.00	-1
 -3333.33	-3333.3333
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3469,9 +3469,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3486,9 +3486,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3505,11 +3505,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3525,11 +3525,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 DROP VIEW v1;
 
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index a00e17d49ed..c31362814be 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -946,8 +946,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -961,8 +961,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	9999999999999999999999999999999999.999999999999
 	0.000000000000000000000000000000	4
 	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2596,9 +2596,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2612,9 +2612,9 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 0	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
-Error	1657	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Error	1916	Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -2970,8 +2970,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2985,8 +2985,8 @@ NULL	NULL	1
 0	0.000000000000000000000000000000	4
 -1	-1.000000000000000000000000000000	5
 Warnings:
-Error	1657	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
-Error	1657	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
+Error	1916	Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
 DROP VIEW v1;
 
 
@@ -3297,9 +3297,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3315,9 +3315,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	30
 Warnings:
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
-Error	1657	Got overflow when converting '' to DECIMAL. Value truncated.
+Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
 DROP VIEW v1;
 
@@ -3387,9 +3387,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal(37,2)) AS `CAST(my_varbinary_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3404,9 +3404,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	29
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3423,11 +3423,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	28
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3445,11 +3445,11 @@ NULL	NULL	1
 -1.00	-1
 -3333.33	-3333.3333
 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: ''
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$-- '
 Warning	1292	Truncated incorrect DECIMAL value: '-1'
 Warning	1292	Truncated incorrect DECIMAL value: '-3333.3333'
@@ -3469,9 +3469,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal(37,2)) AS `CAST(my_varchar_1000 AS DECIMAL(37,2))`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3486,9 +3486,9 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	27
 Warnings:
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 DROP VIEW v1;
 
 
@@ -3505,11 +3505,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
@@ -3525,11 +3525,11 @@ NULL	NULL	1
 -1.00	-1	5
 -3333.33	-3333.3333	26
 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: '                              '
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: '<--------30 characters------->'
-Error	1659	Encountered illegal value '' when converting to DECIMAL
+Error	1918	Encountered illegal value '' when converting to DECIMAL
 Warning	1292	Truncated incorrect DECIMAL value: ' ---äÖüß@µ*$--           '
 DROP VIEW v1;
 
diff --git a/mysql-test/suite/pbxt/r/func_str.result b/mysql-test/suite/pbxt/r/func_str.result
index 1da6b84cb78..39d79d7ec45 100644
--- a/mysql-test/suite/pbxt/r/func_str.result
+++ b/mysql-test/suite/pbxt/r/func_str.result
@@ -1504,7 +1504,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
@@ -1512,22 +1512,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
@@ -1559,8 +1559,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
@@ -1568,26 +1568,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
@@ -1619,8 +1619,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
@@ -1628,26 +1628,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)
 
@@ -1679,8 +1679,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)
 
@@ -1688,26 +1688,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)
 
@@ -1733,8 +1733,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
@@ -1742,26 +1742,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)
 
@@ -1787,10 +1787,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)
 
@@ -1798,34 +1798,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
@@ -1851,7 +1851,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
@@ -1859,22 +1859,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
@@ -1900,7 +1900,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
@@ -1908,22 +1908,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
@@ -1949,8 +1949,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
@@ -1958,26 +1958,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)
 
@@ -2009,8 +2009,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
@@ -2020,27 +2020,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)
@@ -2073,8 +2073,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
@@ -2084,27 +2084,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')
@@ -2137,8 +2137,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
@@ -2148,27 +2148,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')
@@ -2201,8 +2201,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
@@ -2212,27 +2212,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/suite/pbxt/r/type_newdecimal.result b/mysql-test/suite/pbxt/r/type_newdecimal.result
index 55e42621fda..80119559232 100644
--- a/mysql-test/suite/pbxt/r/type_newdecimal.result
+++ b/mysql-test/suite/pbxt/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
@@ -1368,15 +1368,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:
@@ -1447,4 +1447,4 @@ 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.
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index bf2397b2a6a..685fbf04fde 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -507,6 +507,16 @@
 }
 
 {
+   dlclose memory loss from plugin variant 10
+   Memcheck:Leak
+   fun:calloc
+   obj:/lib*/libdl-*.so
+   fun:dlclose
+   fun:*free_plugin_mem*
+   fun:*plugin_dl_del*
+}
+
+{
    dlsym memory loss from plugin on SuSE 11.1 x64
    Memcheck:Leak
    fun:*alloc