Sergey Petrunya fixes for subselect* tests,

and other misc test fixes

8 files changed, 144 insertions, 168 deletions

diff --git a/mysql-test/suite/pbxt/r/func_str.result b/mysql-test/suite/pbxt/r/func_str.result
index df128316084..8c23eee9818 100644
--- a/mysql-test/suite/pbxt/r/func_str.result
+++ b/mysql-test/suite/pbxt/r/func_str.result
@@ -1506,7 +1506,7 @@ select locate('lo','hello',-18446744073709551615);
 locate('lo','hello',-18446744073709551615)
 0
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select locate('lo','hello',18446744073709551615);
 locate('lo','hello',18446744073709551615)
 0
@@ -1514,22 +1514,22 @@ select locate('lo','hello',-18446744073709551616);
 locate('lo','hello',-18446744073709551616)
 0
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select locate('lo','hello',18446744073709551616);
 locate('lo','hello',18446744073709551616)
 0
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select locate('lo','hello',-18446744073709551617);
 locate('lo','hello',-18446744073709551617)
 0
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select locate('lo','hello',18446744073709551617);
 locate('lo','hello',18446744073709551617)
 0
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select left('hello', 10);
 left('hello', 10)
 hello
@@ -1561,8 +1561,8 @@ select left('hello', -18446744073709551615);
 left('hello', -18446744073709551615)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select left('hello', 18446744073709551615);
 left('hello', 18446744073709551615)
 hello
@@ -1570,26 +1570,26 @@ select left('hello', -18446744073709551616);
 left('hello', -18446744073709551616)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select left('hello', 18446744073709551616);
 left('hello', 18446744073709551616)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select left('hello', -18446744073709551617);
 left('hello', -18446744073709551617)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select left('hello', 18446744073709551617);
 left('hello', 18446744073709551617)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select right('hello', 10);
 right('hello', 10)
 hello
@@ -1621,8 +1621,8 @@ select right('hello', -18446744073709551615);
 right('hello', -18446744073709551615)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select right('hello', 18446744073709551615);
 right('hello', 18446744073709551615)
 hello
@@ -1630,26 +1630,26 @@ select right('hello', -18446744073709551616);
 right('hello', -18446744073709551616)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select right('hello', 18446744073709551616);
 right('hello', 18446744073709551616)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select right('hello', -18446744073709551617);
 right('hello', -18446744073709551617)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select right('hello', 18446744073709551617);
 right('hello', 18446744073709551617)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select substring('hello', 2, -1);
 substring('hello', 2, -1)
 
@@ -1681,8 +1681,8 @@ select substring('hello', -18446744073709551615, 1);
 substring('hello', -18446744073709551615, 1)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select substring('hello', 18446744073709551615, 1);
 substring('hello', 18446744073709551615, 1)
 
@@ -1690,26 +1690,26 @@ select substring('hello', -18446744073709551616, 1);
 substring('hello', -18446744073709551616, 1)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select substring('hello', 18446744073709551616, 1);
 substring('hello', 18446744073709551616, 1)
 
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select substring('hello', -18446744073709551617, 1);
 substring('hello', -18446744073709551617, 1)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select substring('hello', 18446744073709551617, 1);
 substring('hello', 18446744073709551617, 1)
 
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select substring('hello', 1, -1);
 substring('hello', 1, -1)
 
@@ -1735,8 +1735,8 @@ select substring('hello', 1, -18446744073709551615);
 substring('hello', 1, -18446744073709551615)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select substring('hello', 1, 18446744073709551615);
 substring('hello', 1, 18446744073709551615)
 hello
@@ -1744,26 +1744,26 @@ select substring('hello', 1, -18446744073709551616);
 substring('hello', 1, -18446744073709551616)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select substring('hello', 1, 18446744073709551616);
 substring('hello', 1, 18446744073709551616)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select substring('hello', 1, -18446744073709551617);
 substring('hello', 1, -18446744073709551617)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select substring('hello', 1, 18446744073709551617);
 substring('hello', 1, 18446744073709551617)
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select substring('hello', -1, -1);
 substring('hello', -1, -1)
 
@@ -1789,10 +1789,10 @@ select substring('hello', -18446744073709551615, -18446744073709551615);
 substring('hello', -18446744073709551615, -18446744073709551615)
 
 Warnings:
-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.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select substring('hello', 18446744073709551615, 18446744073709551615);
 substring('hello', 18446744073709551615, 18446744073709551615)
 
@@ -1800,34 +1800,34 @@ select substring('hello', -18446744073709551616, -18446744073709551616);
 substring('hello', -18446744073709551616, -18446744073709551616)
 
 Warnings:
-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.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select substring('hello', 18446744073709551616, 18446744073709551616);
 substring('hello', 18446744073709551616, 18446744073709551616)
 
 Warnings:
-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.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select substring('hello', -18446744073709551617, -18446744073709551617);
 substring('hello', -18446744073709551617, -18446744073709551617)
 
 Warnings:
-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.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select substring('hello', 18446744073709551617, 18446744073709551617);
 substring('hello', 18446744073709551617, 18446744073709551617)
 
 Warnings:
-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.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select insert('hello', -1, 1, 'hi');
 insert('hello', -1, 1, 'hi')
 hello
@@ -1853,7 +1853,7 @@ select insert('hello', -18446744073709551615, 1, 'hi');
 insert('hello', -18446744073709551615, 1, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select insert('hello', 18446744073709551615, 1, 'hi');
 insert('hello', 18446744073709551615, 1, 'hi')
 hello
@@ -1861,22 +1861,22 @@ select insert('hello', -18446744073709551616, 1, 'hi');
 insert('hello', -18446744073709551616, 1, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select insert('hello', 18446744073709551616, 1, 'hi');
 insert('hello', 18446744073709551616, 1, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select insert('hello', -18446744073709551617, 1, 'hi');
 insert('hello', -18446744073709551617, 1, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select insert('hello', 18446744073709551617, 1, 'hi');
 insert('hello', 18446744073709551617, 1, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select insert('hello', 1, -1, 'hi');
 insert('hello', 1, -1, 'hi')
 hi
@@ -1902,7 +1902,7 @@ select insert('hello', 1, -18446744073709551615, 'hi');
 insert('hello', 1, -18446744073709551615, 'hi')
 hi
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select insert('hello', 1, 18446744073709551615, 'hi');
 insert('hello', 1, 18446744073709551615, 'hi')
 hi
@@ -1910,22 +1910,22 @@ select insert('hello', 1, -18446744073709551616, 'hi');
 insert('hello', 1, -18446744073709551616, 'hi')
 hi
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select insert('hello', 1, 18446744073709551616, 'hi');
 insert('hello', 1, 18446744073709551616, 'hi')
 hi
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select insert('hello', 1, -18446744073709551617, 'hi');
 insert('hello', 1, -18446744073709551617, 'hi')
 hi
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select insert('hello', 1, 18446744073709551617, 'hi');
 insert('hello', 1, 18446744073709551617, 'hi')
 hi
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select insert('hello', -1, -1, 'hi');
 insert('hello', -1, -1, 'hi')
 hello
@@ -1951,8 +1951,8 @@ select insert('hello', -18446744073709551615, -18446744073709551615, 'hi');
 insert('hello', -18446744073709551615, -18446744073709551615, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select insert('hello', 18446744073709551615, 18446744073709551615, 'hi');
 insert('hello', 18446744073709551615, 18446744073709551615, 'hi')
 hello
@@ -1960,26 +1960,26 @@ select insert('hello', -18446744073709551616, -18446744073709551616, 'hi');
 insert('hello', -18446744073709551616, -18446744073709551616, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select insert('hello', 18446744073709551616, 18446744073709551616, 'hi');
 insert('hello', 18446744073709551616, 18446744073709551616, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
 select insert('hello', -18446744073709551617, -18446744073709551617, 'hi');
 insert('hello', -18446744073709551617, -18446744073709551617, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select insert('hello', 18446744073709551617, 18446744073709551617, 'hi');
 insert('hello', 18446744073709551617, 18446744073709551617, 'hi')
 hello
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
 select repeat('hello', -1);
 repeat('hello', -1)
 
@@ -2011,8 +2011,8 @@ select repeat('hello', -18446744073709551615);
 repeat('hello', -18446744073709551615)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select repeat('hello', 18446744073709551615);
 repeat('hello', 18446744073709551615)
 NULL
@@ -2022,27 +2022,27 @@ select repeat('hello', -18446744073709551616);
 repeat('hello', -18446744073709551616)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select repeat('hello', 18446744073709551616);
 repeat('hello', 18446744073709551616)
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	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	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select repeat('hello', 18446744073709551617);
 repeat('hello', 18446744073709551617)
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	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)
@@ -2075,8 +2075,8 @@ select space(-18446744073709551615);
 space(-18446744073709551615)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select space(18446744073709551615);
 space(18446744073709551615)
 NULL
@@ -2086,27 +2086,27 @@ select space(-18446744073709551616);
 space(-18446744073709551616)
 
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select space(18446744073709551616);
 space(18446744073709551616)
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	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	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select space(18446744073709551617);
 space(18446744073709551617)
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	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')
@@ -2139,8 +2139,8 @@ select rpad('hello', -18446744073709551615, '1');
 rpad('hello', -18446744073709551615, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select rpad('hello', 18446744073709551615, '1');
 rpad('hello', 18446744073709551615, '1')
 NULL
@@ -2150,27 +2150,27 @@ select rpad('hello', -18446744073709551616, '1');
 rpad('hello', -18446744073709551616, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select rpad('hello', 18446744073709551616, '1');
 rpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	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	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select rpad('hello', 18446744073709551617, '1');
 rpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	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')
@@ -2203,8 +2203,8 @@ select lpad('hello', -18446744073709551615, '1');
 lpad('hello', -18446744073709551615, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551615' to INT. Value truncated.
 select lpad('hello', 18446744073709551615, '1');
 lpad('hello', 18446744073709551615, '1')
 NULL
@@ -2214,28 +2214,27 @@ select lpad('hello', -18446744073709551616, '1');
 lpad('hello', -18446744073709551616, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551616' to INT. Value truncated.
 select lpad('hello', 18446744073709551616, '1');
 lpad('hello', 18446744073709551616, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	1916	Got overflow when converting '18446744073709551616' to INT. Value truncated.
+Warning	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	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-18446744073709551617' to INT. Value truncated.
 select lpad('hello', 18446744073709551617, '1');
 lpad('hello', 18446744073709551617, '1')
 NULL
 Warnings:
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
-Error	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
->>>>>>> MERGE-SOURCE
+Warning	1916	Got overflow when converting '18446744073709551617' to INT. Value truncated.
+Warning	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/group_by.result b/mysql-test/suite/pbxt/r/group_by.result
index 43099e7ec95..c2f31b2165b 100644
--- a/mysql-test/suite/pbxt/r/group_by.result
+++ b/mysql-test/suite/pbxt/r/group_by.result
@@ -1171,8 +1171,8 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 EXPLAIN SELECT 1 FROM t1 WHERE a IN
 (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	index	PRIMARY,i2	PRIMARY	4	NULL	144	Using index
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	144	Using where; FirstMatch(t1)
+1	PRIMARY	t1	index	NULL	PRIMARY	4	NULL	144	Using where; Using index
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	144	Using where
 CREATE TABLE t2 (a INT, b INT, KEY(a));
 INSERT INTO t2 VALUES (1, 1), (2, 2), (3,3), (4,4);
 EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2;
@@ -1184,11 +1184,6 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 EXPLAIN SELECT 1 FROM t2 WHERE a IN
 (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t2	index	a	a	5	NULL	4	Using index
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	144	Using where; FirstMatch(t2)
-SHOW VARIABLES LIKE 'old';
-Variable_name	Value
-old	OFF
-SET @@old = off;
-ERROR HY000: Variable 'old' is a read only variable
+1	PRIMARY	t2	index	NULL	a	5	NULL	4	Using where; Using index
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	144	Using where
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/pbxt/r/join.result b/mysql-test/suite/pbxt/r/join.result
index 146cbe163b6..291c78deb74 100644
--- a/mysql-test/suite/pbxt/r/join.result
+++ b/mysql-test/suite/pbxt/r/join.result
@@ -699,10 +699,9 @@ select * from v1a join v1b on t1.b = t2.b;
 ERROR 42S22: Unknown column 't1.b' in 'on clause'
 select * from information_schema.statistics join information_schema.columns
 using(table_name,column_name) where table_name='user';
-TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
-user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#	
-user	User	NULL	mysql	0	mysql	PRIMARY	2	A	3	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	
->>>>>>> MERGE-SOURCE
+TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	INDEX_COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+user	Host	def	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE			def	mysql	1		NO	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)	PRI	#	select,insert,update,references	
+user	User	def	mysql	0	mysql	PRIMARY	2	A	4	NULL	NULL		BTREE			def	mysql	2		NO	char	16	48	NULL	NULL	NULL	utf8	utf8_bin	char(16)	PRI	#	select,insert,update,references	
 drop table t1;
 drop table t2;
 drop table t3;
diff --git a/mysql-test/suite/pbxt/r/ps_1general.result b/mysql-test/suite/pbxt/r/ps_1general.result
index 3b378000784..4fe13c4bc50 100644
--- a/mysql-test/suite/pbxt/r/ps_1general.result
+++ b/mysql-test/suite/pbxt/r/ps_1general.result
@@ -443,7 +443,7 @@ prepare stmt1 from ' KILL 0 ';
 prepare stmt1 from ' explain select a from t1 order by b ';
 execute stmt1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					id	8	3	1	N	32929	0	63
+def					id	8	3	1	Y	32928	0	63
 def					select_type	253	19	6	N	1	31	8
 def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
@@ -459,7 +459,7 @@ SET @arg00=1 ;
 prepare stmt1 from ' explain select a from t1 where a > ? order by b ';
 execute stmt1 using @arg00;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					id	8	3	1	N	32929	0	63
+def					id	8	3	1	Y	32928	0	63
 def					select_type	253	19	6	N	1	31	8
 def					table	253	64	2	Y	0	31	8
 def					type	253	10	5	Y	0	31	8
diff --git a/mysql-test/suite/pbxt/r/status.result b/mysql-test/suite/pbxt/r/status.result
index 3a231c20d9e..26de6dc7d7f 100644
--- a/mysql-test/suite/pbxt/r/status.result
+++ b/mysql-test/suite/pbxt/r/status.result
@@ -101,7 +101,7 @@ Com_show_status	3
 show status like 'hand%write%';
 Variable_name	Value
 Handler_tmp_write	0
-Handler_write	5
+Handler_write	0
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
@@ -113,7 +113,7 @@ Rows_tmp_read	5
 show status like 'hand%write%';
 Variable_name	Value
 Handler_tmp_write	0
-Handler_write	7
+Handler_write	0
 show status like '%tmp%';
 Variable_name	Value
 Created_tmp_disk_tables	0
diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result
index 5b2f1560038..f8f75a6f543 100644
--- a/mysql-test/suite/pbxt/r/subselect.result
+++ b/mysql-test/suite/pbxt/r/subselect.result
@@ -50,11 +50,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
 Note	1276	Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1
-<<<<<<< TREE
-Note	1003	select 1 AS `1` from dual having (<expr_cache><'1'>((select '1')) = 1)
-=======
-Note	1003	select 1 AS `1` from (select 1 AS `a`) `b` having ((select 1) = 1)
->>>>>>> MERGE-SOURCE
+Note	1003	select 1 AS `1` from dual having ((select 1) = 1)
 SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
 1
 1
@@ -207,11 +203,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 3	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 2	SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where; Using filesort
 Warnings:
-<<<<<<< TREE
-Note	1003	select (select `test`.`t3`.`a` from `test`.`t3` where (`test`.`t3`.`a` < 8) order by 1 desc limit 1) AS `(select t3.a from t3 where a<8 order by 1 desc limit 1)`,'2' AS `a` from dual
-=======
 Note	1003	select (select `test`.`t3`.`a` from `test`.`t3` where (`test`.`t3`.`a` < 8) order by 1 desc limit 1) AS `(select t3.a from t3 where a<8 order by 1 desc limit 1)`,`tt`.`a` AS `a` from (select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`a` > 1)) `tt`
->>>>>>> MERGE-SOURCE
 select * from t1 where t1.a=(select t2.a from t2 where t2.b=(select max(a) from t3) order by 1 desc limit 1);
 a
 2
@@ -1189,7 +1181,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
-Note	1003	select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
+Note	1003	select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
 INSERT INTO t1 (pseudo) VALUES ('test1');
 SELECT 0 IN (SELECT 1 FROM t1 a);
 0 IN (SELECT 1 FROM t1 a)
@@ -4302,7 +4294,7 @@ NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL
 Warnings:
 Note	1276	Field or reference 'test.t1.a' of SELECT #2 was resolved in SELECT #1
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1
-Note	1003	select 2 AS `2` from `test`.`t1` where <expr_cache><`test`.`t1`.`a`>(exists((select 1 from `test`.`t2` where (`test`.`t1`.`a` = `test`.`t2`.`a`)) union (select 1 from `test`.`t2` where (`test`.`t1`.`a` = `test`.`t2`.`a`))))
+Note	1003	select 2 AS `2` from `test`.`t1` where exists((select 1 from `test`.`t2` where (`test`.`t1`.`a` = `test`.`t2`.`a`)) union (select 1 from `test`.`t2` where (`test`.`t1`.`a` = `test`.`t2`.`a`)))
 DROP TABLE t1,t2;
 create table t1(f11 int, f12 int);
 create table t2(f21 int unsigned not null, f22 int, f23 varchar(10));
diff --git a/mysql-test/suite/pbxt/r/type_newdecimal.result b/mysql-test/suite/pbxt/r/type_newdecimal.result
index 1bb56d1978e..a5349d32b03 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	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
 select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 1 as x;
 x
 100000000000000000000000000000000000000000000000000000000000000000
 Warnings:
-Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	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,16 +1368,12 @@ create table t1 (c1 decimal(64));
 insert into t1 values(
 89000000000000000000000000000000000000000000000000000000000000000000000000000000000000000);
 Warnings:
-Error	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	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	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
+ERROR 22003: DECIMAL value is out of range in '(99999999999999999999999999999999999999999999999999999999999999999 * 99999999999999999999999999999999999999999999999999999999999999999)'
 insert into t1 values(1e100);
 Warnings:
 Warning	1264	Out of range value for column 'c1' at row 1
@@ -1446,4 +1442,4 @@ select cast(19999999999999999999 as unsigned);
 cast(19999999999999999999 as unsigned)
 18446744073709551615
 Warnings:
-Error	1916	Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated.
diff --git a/mysql-test/suite/pbxt/t/group_by.test b/mysql-test/suite/pbxt/t/group_by.test
index 5e86b896731..46995ded550 100644
--- a/mysql-test/suite/pbxt/t/group_by.test
+++ b/mysql-test/suite/pbxt/t/group_by.test
@@ -777,13 +777,8 @@ EXPLAIN SELECT a, SUM(b) FROM t2 IGNORE INDEX (a) GROUP BY a LIMIT 2;
 EXPLAIN SELECT 1 FROM t2 WHERE a IN
   (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));
 
-SHOW VARIABLES LIKE 'old';  
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@old = off;  
-
 DROP TABLE t1, t2;
 
-
 --disable_query_log
 drop database pbxt;
 --enable_query_log