1 files changed, 49 insertions, 49 deletions
diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
index 9d3eadcc26f..cddfa9f52c9 100644
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
@@ -3,32 +3,32 @@ SET @start_session_value = @@session.sort_buffer_size;
 '#--------------------FN_DYNVARS_151_01-------------------------#'
 SET @@global.sort_buffer_size = 1000;
 SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size BETWEEN 2097116 AND 2100000;
-@@global.sort_buffer_size BETWEEN 2097116 AND 2100000
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+2097152
 SET @@session.sort_buffer_size = 2000;
 SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size BETWEEN 2097116 AND 2100000;
-@@session.sort_buffer_size BETWEEN 2097116 AND 2100000
-1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+2097152
 '#--------------------FN_DYNVARS_151_02-------------------------#'
 SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size BETWEEN 2097116 AND 2100000;
-@@global.sort_buffer_size BETWEEN 2097116 AND 2100000
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+2097152
 SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size BETWEEN 2097116 AND 2100000;
-@@session.sort_buffer_size BETWEEN 2097116 AND 2100000
-1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+2097152
 '#--------------------FN_DYNVARS_151_03-------------------------#'
 SET @@global.sort_buffer_size = 32776;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32776
 SET @@global.sort_buffer_size = 32777;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32777
 SET @@global.sort_buffer_size = 4294967295;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
@@ -39,13 +39,13 @@ SELECT @@global.sort_buffer_size;
 4294967294
 '#--------------------FN_DYNVARS_151_04-------------------------#'
 SET @@session.sort_buffer_size = 32776;
-SELECT @@session.sort_buffer_size BETWEEN 32776 AND 32999;
-@@session.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32776
 SET @@session.sort_buffer_size = 32777;
-SELECT @@session.sort_buffer_size BETWEEN 32776 AND 32999;
-@@session.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32777
 SET @@session.sort_buffer_size = 4294967295;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
@@ -56,19 +56,19 @@ SELECT @@session.sort_buffer_size;
 4294967294
 '#------------------FN_DYNVARS_151_05-----------------------#'
 SET @@global.sort_buffer_size = 32775;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32775
 SET @@global.sort_buffer_size = -1024;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32768
 SET @@global.sort_buffer_size = 4294967296;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
 4294967295
-SET @@global.sort_buffer_size = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
+SET @@global.sort_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
 4294967295
@@ -78,15 +78,15 @@ SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
 4294967295
 SET @@session.sort_buffer_size = 32775;
-SELECT @@session.sort_buffer_size BETWEEN 32776 AND 32999;
-@@session.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32775
 SET @@session.sort_buffer_size = -2;
-SELECT @@session.sort_buffer_size BETWEEN 32776 AND 32999;
-@@session.sort_buffer_size BETWEEN 32776 AND 32999
-1
-SET @@session.sort_buffer_size = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
+SELECT @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32768
+SET @@session.sort_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
 SET @@session.sort_buffer_size = 4294967296;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
@@ -105,13 +105,13 @@ INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
 1
 '#------------------FN_DYNVARS_151_08-----------------------#'
 SET @@global.sort_buffer_size = TRUE;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32768
 SET @@global.sort_buffer_size = FALSE;
-SELECT @@global.sort_buffer_size BETWEEN 32776 AND 32999;
-@@global.sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@global.sort_buffer_size;
+@@global.sort_buffer_size
+32768
 '#---------------------FN_DYNVARS_151_09----------------------#'
 SET @@global.sort_buffer_size = 9000;
 SELECT @@sort_buffer_size = @@global.sort_buffer_size;
@@ -127,9 +127,9 @@ SELECT @@local.sort_buffer_size = @@session.sort_buffer_size;
 1
 '#---------------------FN_DYNVARS_151_11----------------------#'
 SET sort_buffer_size = 9100;
-SELECT @@sort_buffer_size BETWEEN 32776 AND 32999;
-@@sort_buffer_size BETWEEN 32776 AND 32999
-1
+SELECT @@sort_buffer_size;
+@@sort_buffer_size
+32768
 SELECT local.sort_buffer_size;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.sort_buffer_size;