MDEV-4629 MTR tests main.variables and some of sys_vars.* fail on 32-bit builds

Additional fix for remaining issues with sys_vars.* tests

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
-max_binlog_cache_size
+max_bulk_insert_buffer_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
-max_binlog_cache_size
+max_bulk_insert_buffer_size
 SET @@session.bulk_insert_buffer_size = -2;
 Warnings:
 Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'

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

@@ -102,7 +102,7 @@ SELECT @@session.bulk_insert_buffer_size;
 --disable_warnings
 SET @@global.bulk_insert_buffer_size = 42949672950;
 --enable_warnings
---replace_result 4294967295 max_bulk_insert_buffer_size 42949672950 max_binlog_cache_size
+--replace_result 4294967295 max_bulk_insert_buffer_size 42949672950 max_bulk_insert_buffer_size
 SELECT @@global.bulk_insert_buffer_size;
 SET @@global.bulk_insert_buffer_size = -1024;
 SELECT @@global.bulk_insert_buffer_size;
@@ -117,7 +117,7 @@ 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
+--replace_result 4294967295 max_bulk_insert_buffer_size 42949672950 max_bulk_insert_buffer_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/sort_buffer_size_basic.test

@@ -120,7 +120,7 @@ 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
+--replace_result 4294967296 max_sort_buffer_size 4294967295 max_sort_buffer_size
 SELECT @@global.sort_buffer_size;
 SET @@global.sort_buffer_size = 1024*1024;