Merge with main 5.3

1 files changed, 125 insertions, 125 deletions

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 03fa25ba7b5..4a8f1b53d7e 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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select locate('lo','hello',18446744073709551616);
 locate('lo','hello',18446744073709551616)
 0
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select locate('lo','hello',-18446744073709551617);
 locate('lo','hello',-18446744073709551617)
 0
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select locate('lo','hello',18446744073709551617);
 locate('lo','hello',18446744073709551617)
 0
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 select left('hello', 18446744073709551615);
 left('hello', 18446744073709551615)
 hello
@@ -1597,26 +1597,26 @@ select left('hello', -18446744073709551616);
 left('hello', -18446744073709551616)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select left('hello', 18446744073709551616);
 left('hello', 18446744073709551616)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select left('hello', -18446744073709551617);
 left('hello', -18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select left('hello', 18446744073709551617);
 left('hello', 18446744073709551617)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select right('hello', 10);
 right('hello', 10)
 hello
@@ -1648,8 +1648,8 @@ select right('hello', -18446744073709551615);
 right('hello', -18446744073709551615)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 select right('hello', 18446744073709551615);
 right('hello', 18446744073709551615)
 hello
@@ -1657,26 +1657,26 @@ select right('hello', -18446744073709551616);
 right('hello', -18446744073709551616)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select right('hello', 18446744073709551616);
 right('hello', 18446744073709551616)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select right('hello', -18446744073709551617);
 right('hello', -18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select right('hello', 18446744073709551617);
 right('hello', 18446744073709551617)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 2, -1);
 substring('hello', 2, -1)
 
@@ -1708,8 +1708,8 @@ select substring('hello', -18446744073709551615, 1);
 substring('hello', -18446744073709551615, 1)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 18446744073709551615, 1);
 substring('hello', 18446744073709551615, 1)
 
@@ -1717,26 +1717,26 @@ select substring('hello', -18446744073709551616, 1);
 substring('hello', -18446744073709551616, 1)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 18446744073709551616, 1);
 substring('hello', 18446744073709551616, 1)
 
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', -18446744073709551617, 1);
 substring('hello', -18446744073709551617, 1)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 18446744073709551617, 1);
 substring('hello', 18446744073709551617, 1)
 
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 1, -1);
 substring('hello', 1, -1)
 
@@ -1762,8 +1762,8 @@ select substring('hello', 1, -18446744073709551615);
 substring('hello', 1, -18446744073709551615)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 1, 18446744073709551616);
 substring('hello', 1, 18446744073709551616)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 1, -18446744073709551617);
 substring('hello', 1, -18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', 1, 18446744073709551617);
 substring('hello', 1, 18446744073709551617)
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select substring('hello', -1, -1);
 substring('hello', -1, -1)
 
@@ -1816,10 +1816,10 @@ select substring('hello', -18446744073709551615, -18446744073709551615);
 substring('hello', -18446744073709551615, -18446744073709551615)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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	1657	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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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	1657	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select substring('hello', 18446744073709551616, 18446744073709551616);
 substring('hello', 18446744073709551616, 18446744073709551616)
 
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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	1657	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select substring('hello', -18446744073709551617, -18446744073709551617);
 substring('hello', -18446744073709551617, -18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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	1657	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select substring('hello', 18446744073709551617, 18446744073709551617);
 substring('hello', 18446744073709551617, 18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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	1657	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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select insert('hello', 18446744073709551616, 1, 'hi');
 insert('hello', 18446744073709551616, 1, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select insert('hello', -18446744073709551617, 1, 'hi');
 insert('hello', -18446744073709551617, 1, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select insert('hello', 18446744073709551617, 1, 'hi');
 insert('hello', 18446744073709551617, 1, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select insert('hello', 1, 18446744073709551616, 'hi');
 insert('hello', 1, 18446744073709551616, 'hi')
 hi
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Error	1657	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select insert('hello', 1, -18446744073709551617, 'hi');
 insert('hello', 1, -18446744073709551617, 'hi')
 hi
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Error	1657	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select insert('hello', 1, 18446744073709551617, 'hi');
 insert('hello', 1, 18446744073709551617, 'hi')
 hi
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Error	1657	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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
 insert('hello', 18446744073709551616, 18446744073709551616, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
 insert('hello', -18446744073709551617, -18446744073709551617, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
 insert('hello', 18446744073709551617, 18446744073709551617, 'hi')
 hello
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select repeat('hello', -1);
 repeat('hello', -1)
 
@@ -2038,8 +2038,8 @@ select repeat('hello', -18446744073709551615);
 repeat('hello', -18446744073709551615)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 select repeat('hello', 18446744073709551615);
 repeat('hello', 18446744073709551615)
 NULL
@@ -2049,27 +2049,27 @@ select repeat('hello', -18446744073709551616);
 repeat('hello', -18446744073709551616)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select repeat('hello', 18446744073709551616);
 repeat('hello', 18446744073709551616)
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select repeat('hello', -18446744073709551617);
 repeat('hello', -18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select repeat('hello', 18446744073709551617);
 repeat('hello', 18446744073709551617)
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 select space(18446744073709551615);
 space(18446744073709551615)
 NULL
@@ -2113,27 +2113,27 @@ select space(-18446744073709551616);
 space(-18446744073709551616)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select space(18446744073709551616);
 space(18446744073709551616)
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 Warning	1301	Result of repeat() was larger than max_allowed_packet (1048576) - truncated
 select space(-18446744073709551617);
 space(-18446744073709551617)
 
 Warnings:
-Error	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select space(18446744073709551617);
 space(18446744073709551617)
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select rpad('hello', 18446744073709551616, '1');
 rpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select rpad('hello', 18446744073709551617, '1');
 rpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 select lpad('hello', 18446744073709551616, '1');
 lpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1655	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.
 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	1655	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 select lpad('hello', 18446744073709551617, '1');
 lpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
-Error	1655	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1655	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.
 Warning	1301	Result of lpad() was larger than max_allowed_packet (1048576) - truncated
 SET @orig_sql_mode = @@SQL_MODE;
 SET SQL_MODE=traditional;