Fix merge: fix test.

mysql-test/t/variables.test

@@ -141,9 +141,9 @@ set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
 select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';
 set GLOBAL myisam_max_sort_file_size=default;
---replace_result 2147483647 FILE_SIZE 9223372036853727232 FILE_SIZE
+--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE
 show global variables like 'myisam_max_sort_file_size';
---replace_result 2147483647 FILE_SIZE 9223372036853727232 FILE_SIZE
+--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE
 select * from information_schema.global_variables where variable_name like 'myisam_max_sort_file_size';
 
 set global net_retry_count=10, session net_retry_count=10;