Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits.

mysql-test/r/variables.result

@@ -1497,7 +1497,7 @@ SET @old_max_binlog_cache_size = @@GLOBAL.max_binlog_cache_size;
 SET GLOBAL max_binlog_cache_size = 5 * 1024 * 1024 * 1024;
 SELECT @@GLOBAL.max_binlog_cache_size;
 @@GLOBAL.max_binlog_cache_size
-5368709120
+max_size
 SET GLOBAL max_binlog_cache_size = @old_max_binlog_cache_size;
 #
 # Bug #37168 : Missing variable - skip_name_resolve

mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result

@@ -59,7 +59,7 @@ Warnings:
 Warning	1292	Truncated incorrect binlog_cache_size value: '42949672950'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
-42949668864
+max_binlog_cache_size
 'Bug: Errors are not coming on assigning invalid values to variable'
 SET @@global.binlog_cache_size = ON;
 ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'

mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result

@@ -59,7 +59,7 @@ Warnings:
 Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '42949672950'
 SELECT @@global.binlog_stmt_cache_size;
 @@global.binlog_stmt_cache_size
-42949668864
+max_binlog_cache_size
 'Bug: Errors are not coming on assigning invalid values to variable'
 SET @@global.binlog_stmt_cache_size = ON;
 ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'

mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result

@@ -64,7 +64,7 @@ SELECT @@session.bulk_insert_buffer_size;
 SET @@global.bulk_insert_buffer_size = 42949672950;
 SELECT @@global.bulk_insert_buffer_size;
 @@global.bulk_insert_buffer_size
-42949672950
+max_binlog_cache_size
 SET @@global.bulk_insert_buffer_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-1024'
@@ -80,7 +80,7 @@ ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
 SET @@session.bulk_insert_buffer_size = 42949672950;
 SELECT @@session.bulk_insert_buffer_size;
 @@session.bulk_insert_buffer_size
-42949672950
+max_binlog_cache_size
 SET @@session.bulk_insert_buffer_size = -2;
 Warnings:
 Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'

mysql-test/suite/sys_vars/r/join_buffer_size_basic.result

@@ -73,17 +73,18 @@ Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949672832
+max_join_buffer_size
+SET @@global.join_buffer_size = 1024*1024;
 SET @@global.join_buffer_size = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949672832
+1048576
 SET @@global.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949672832
+1048576
 SET @@session.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
@@ -107,17 +108,18 @@ Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949672832
+max_join_buffer_size
+SET @@session.join_buffer_size = 1024*1024;
 SET @@session.join_buffer_size = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949672832
+1048576
 SET @@session.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949672832
+1048576
 '#------------------FN_DYNVARS_053_06-----------------------#'
 SELECT @@global.join_buffer_size = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 

mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result

 SET @start_value = @@global.max_binlog_cache_size;
 SELECT @start_value;
 @start_value
-18446744073709547520
+max_binlog_cache_size
 '#--------------------FN_DYNVARS_072_01------------------------#'
 SET @@global.max_binlog_cache_size = 5000;
 Warnings:
@@ -9,7 +9,7 @@ Warning	1292	Truncated incorrect max_binlog_cache_size value: '5000'
 SET @@global.max_binlog_cache_size = DEFAULT;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
-18446744073709547520
+max_binlog_cache_size
 '#---------------------FN_DYNVARS_072_02-------------------------#'
 SET @@global.max_binlog_cache_size = @start_value;
 SELECT @@global.max_binlog_cache_size = 4294967295;
@@ -56,12 +56,13 @@ Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '100000000000'
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
-99999997952
+max_binlog_cache_size
+SET @@global.max_binlog_cache_size = 1024*1024;
 SET @@global.max_binlog_cache_size = 10000.01;
 ERROR 42000: Incorrect argument type to variable 'max_binlog_cache_size'
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
-99999997952
+1048576
 SET @@global.max_binlog_cache_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '-1024'
@@ -77,7 +78,7 @@ SELECT @@global.max_binlog_cache_size;
 SET @@global.max_binlog_cache_size = 4294967296;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
-4294967296
+max_binlog_cache_size
 SET @@global.max_binlog_cache_size = 4095;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '4095'
@@ -149,4 +150,4 @@ ERROR 42S22: Unknown column 'max_binlog_cache_size' in 'field list'
 SET @@global.max_binlog_cache_size = @start_value;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size
-18446744073709547520
+max_binlog_cache_size

mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result

 SET @start_value = @@global.max_binlog_stmt_cache_size;
 SELECT @start_value;
 @start_value
-18446744073709547520
+max_binlog_stmt_cache_size
 '#--------------------FN_DYNVARS_072_01------------------------#'
 SET @@global.max_binlog_stmt_cache_size = 5000;
 Warnings:
@@ -9,7 +9,7 @@ Warning	1292	Truncated incorrect max_binlog_stmt_cache_size value: '5000'
 SET @@global.max_binlog_stmt_cache_size = DEFAULT;
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
-18446744073709547520
+max_binlog_stmt_cache_size
 '#---------------------FN_DYNVARS_072_02-------------------------#'
 SET @@global.max_binlog_stmt_cache_size = @start_value;
 SELECT @@global.max_binlog_stmt_cache_size = 4294967295;
@@ -56,12 +56,13 @@ Warnings:
 Warning	1292	Truncated incorrect max_binlog_stmt_cache_size value: '100000000000'
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
-99999997952
+max_binlog_stmt_cache_size
+SET @@global.max_binlog_stmt_cache_size = 1024*1024;
 SET @@global.max_binlog_stmt_cache_size = 10000.01;
 ERROR 42000: Incorrect argument type to variable 'max_binlog_stmt_cache_size'
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
-99999997952
+1048576
 SET @@global.max_binlog_stmt_cache_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_stmt_cache_size value: '-1024'
@@ -77,7 +78,7 @@ SELECT @@global.max_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = 4294967296;
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
-4294967296
+max_binlog_stmt_cache_size
 SET @@global.max_binlog_stmt_cache_size = 4095;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_stmt_cache_size value: '4095'
@@ -149,4 +150,4 @@ ERROR 42S22: Unknown column 'max_binlog_stmt_cache_size' in 'field list'
 SET @@global.max_binlog_stmt_cache_size = @start_value;
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size
-18446744073709547520
+max_binlog_stmt_cache_size

mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result

@@ -66,17 +66,18 @@ SELECT @@global.sort_buffer_size;
 SET @@global.sort_buffer_size = 4294967296;
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-4294967296
+max_sort_buffer_size
+SET @@global.sort_buffer_size = 1024*1024;
 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
-4294967296
+1048576
 SET @@global.sort_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
 SELECT @@global.sort_buffer_size;
 @@global.sort_buffer_size
-4294967296
+1048576
 SET @@session.sort_buffer_size = 32775;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
@@ -87,10 +88,10 @@ SELECT @@session.sort_buffer_size;
 1024
 SET @@session.sort_buffer_size = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SET @@session.sort_buffer_size = 4294967296;
+SET @@session.sort_buffer_size = 4294967295;
 SELECT @@session.sort_buffer_size;
 @@session.sort_buffer_size
-4294967296
+4294967295
 SET @@session.sort_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
 '#------------------FN_DYNVARS_151_06-----------------------#'

mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test

@@ -81,6 +81,7 @@ SET @@global.binlog_cache_size = 10000.01;
 SET @@global.binlog_cache_size = -1024;
 SELECT @@global.binlog_cache_size;
 SET @@global.binlog_cache_size = 42949672950;
+--replace_result 4294963200 max_binlog_cache_size 42949668864 max_binlog_cache_size
 SELECT @@global.binlog_cache_size;
 echo 'Bug: Errors are not coming on assigning invalid values to variable';
 

mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test

@@ -81,6 +81,7 @@ SET @@global.binlog_stmt_cache_size = 10000.01;
 SET @@global.binlog_stmt_cache_size = -1024;
 SELECT @@global.binlog_stmt_cache_size;
 SET @@global.binlog_stmt_cache_size = 42949672950;
+--replace_result 4294963200 max_binlog_cache_size 42949668864 max_binlog_cache_size
 SELECT @@global.binlog_stmt_cache_size;
 echo 'Bug: Errors are not coming on assigning invalid values to variable';
 

mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test

@@ -99,7 +99,10 @@ SELECT @@session.bulk_insert_buffer_size;
 # Change the value of bulk_insert_buffer_size to an invalid value #
 ###################################################################
 
+--disable_warnings
 SET @@global.bulk_insert_buffer_size = 42949672950;
+--enable_warnings
+--replace_result 4294967295 max_bulk_insert_buffer_size 42949672950 max_binlog_cache_size
 SELECT @@global.bulk_insert_buffer_size;
 SET @@global.bulk_insert_buffer_size = -1024;
 SELECT @@global.bulk_insert_buffer_size;
@@ -111,7 +114,10 @@ SET @@global.bulk_insert_buffer_size = ON;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.bulk_insert_buffer_size = 429496.10;
 
+--disable_warnings
 SET @@session.bulk_insert_buffer_size = 42949672950;
+--enable_warnings
+--replace_result 4294967295 max_bulk_insert_buffer_size 42949672950 max_binlog_cache_size
 SELECT @@session.bulk_insert_buffer_size;
 SET @@session.bulk_insert_buffer_size = -2;
 SELECT @@session.bulk_insert_buffer_size;

mysql-test/suite/sys_vars/t/join_buffer_size_basic.test

@@ -88,7 +88,9 @@ SELECT @@global.join_buffer_size;
 SET @@global.join_buffer_size = 127;
 SELECT @@global.join_buffer_size;
 SET @@global.join_buffer_size = 42949672951;
+--replace_result 42949672832 max_join_buffer_size 4294967168 max_join_buffer_size
 SELECT @@global.join_buffer_size;
+SET @@global.join_buffer_size = 1024*1024;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.join_buffer_size = 65530.34;
@@ -104,7 +106,9 @@ SELECT @@session.join_buffer_size;
 SET @@session.join_buffer_size = 127;
 SELECT @@session.join_buffer_size;
 SET @@session.join_buffer_size = 42949672951;
+--replace_result 42949672832 max_join_buffer_size 4294967168 max_join_buffer_size
 SELECT @@session.join_buffer_size;
+SET @@session.join_buffer_size = 1024*1024;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.join_buffer_size = 65530.34;

mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test

@@ -38,6 +38,7 @@
 ######################################################################## 
 
 SET @start_value = @@global.max_binlog_cache_size;
+--replace_result 18446744073709547520 max_binlog_cache_size 4294963200 max_binlog_cache_size
 SELECT @start_value;
 
 
@@ -48,6 +49,7 @@ SELECT @start_value;
 
 SET @@global.max_binlog_cache_size = 5000;
 SET @@global.max_binlog_cache_size = DEFAULT;
+--replace_result 18446744073709547520 max_binlog_cache_size 4294963200 max_binlog_cache_size
 SELECT @@global.max_binlog_cache_size;
 
 
@@ -84,7 +86,9 @@ SELECT @@global.max_binlog_cache_size;
 SET @@global.max_binlog_cache_size = -1;
 SELECT @@global.max_binlog_cache_size;
 SET @@global.max_binlog_cache_size = 100000000000;
+--replace_result 99999997952 max_binlog_cache_size 4294963200 max_binlog_cache_size
 SELECT @@global.max_binlog_cache_size;
+SET @@global.max_binlog_cache_size = 1024*1024;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.max_binlog_cache_size = 10000.01;
 SELECT @@global.max_binlog_cache_size;
@@ -92,7 +96,10 @@ SET @@global.max_binlog_cache_size = -1024;
 SELECT @@global.max_binlog_cache_size;
 SET @@global.max_binlog_cache_size = 1024;
 SELECT @@global.max_binlog_cache_size;
+--disable_warnings
 SET @@global.max_binlog_cache_size = 4294967296;
+--enable_warnings
+--replace_result 4294963200 max_binlog_cache_size 4294967296 max_binlog_cache_size
 SELECT @@global.max_binlog_cache_size;
 SET @@global.max_binlog_cache_size = 4095;
 SELECT @@global.max_binlog_cache_size;
@@ -175,6 +182,7 @@ SELECT max_binlog_cache_size = @@session.max_binlog_cache_size;
 ##############################
 
 SET @@global.max_binlog_cache_size = @start_value;
+--replace_result 4294963200 max_binlog_cache_size 18446744073709547520 max_binlog_cache_size
 SELECT @@global.max_binlog_cache_size;
 
 

mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test

@@ -39,6 +39,7 @@
 ############################################################################## 
 
 SET @start_value = @@global.max_binlog_stmt_cache_size;
+--replace_result 18446744073709547520 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size
 SELECT @start_value;
 
 
@@ -49,6 +50,7 @@ SELECT @start_value;
 
 SET @@global.max_binlog_stmt_cache_size = 5000;
 SET @@global.max_binlog_stmt_cache_size = DEFAULT;
+--replace_result 18446744073709547520 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size
 SELECT @@global.max_binlog_stmt_cache_size;
 
 
@@ -85,7 +87,9 @@ SELECT @@global.max_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = -1;
 SELECT @@global.max_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = 100000000000;
+--replace_result 99999997952 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size
 SELECT @@global.max_binlog_stmt_cache_size;
+SET @@global.max_binlog_stmt_cache_size = 1024*1024;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.max_binlog_stmt_cache_size = 10000.01;
 SELECT @@global.max_binlog_stmt_cache_size;
@@ -93,7 +97,10 @@ SET @@global.max_binlog_stmt_cache_size = -1024;
 SELECT @@global.max_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = 1024;
 SELECT @@global.max_binlog_stmt_cache_size;
+--disable_warnings
 SET @@global.max_binlog_stmt_cache_size = 4294967296;
+--enable_warnings
+--replace_result 4294963200 max_binlog_stmt_cache_size 4294967296 max_binlog_stmt_cache_size
 SELECT @@global.max_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = 4095;
 SELECT @@global.max_binlog_stmt_cache_size;
@@ -176,6 +183,7 @@ SELECT max_binlog_stmt_cache_size = @@session.max_binlog_stmt_cache_size;
 ##############################
 
 SET @@global.max_binlog_stmt_cache_size = @start_value;
+--replace_result 4294963200 max_binlog_stmt_cache_size 18446744073709547520 max_binlog_stmt_cache_size
 SELECT @@global.max_binlog_stmt_cache_size;
 
 

mysql-test/suite/sys_vars/t/sort_buffer_size_basic.test

@@ -120,7 +120,10 @@ SET @@global.sort_buffer_size = -1024;
 eval 
 SELECT @@global.sort_buffer_size;
 SET @@global.sort_buffer_size = 4294967296;
+--replace_result 4294967296 max_sort_buffer_size 4294967296 max_sort_buffer_size
 SELECT @@global.sort_buffer_size;
+SET @@global.sort_buffer_size = 1024*1024;
+
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.sort_buffer_size = 65530.34;
 SELECT @@global.sort_buffer_size;
@@ -136,7 +139,7 @@ eval
 SELECT @@session.sort_buffer_size;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.sort_buffer_size = 65530.34;
-SET @@session.sort_buffer_size = 4294967296;
+SET @@session.sort_buffer_size = 4294967295;
 SELECT @@session.sort_buffer_size;
 
 --Error ER_WRONG_TYPE_FOR_VAR

mysql-test/t/variables.test

@@ -1228,7 +1228,10 @@ DROP TABLE t1;
 
 SET @old_max_binlog_cache_size = @@GLOBAL.max_binlog_cache_size;
 --echo # Set the max_binlog_cache_size to size more than 4GB. 
+--disable_warnings
 SET GLOBAL max_binlog_cache_size = 5 * 1024 * 1024 * 1024;
+--enable_warnings
+--replace_result 5368709120 max_size 4294963200 max_size
 SELECT @@GLOBAL.max_binlog_cache_size;
 SET GLOBAL max_binlog_cache_size = @old_max_binlog_cache_size;