Fix merge.

mysql-test/t/variables.test

@@ -144,7 +144,7 @@ set GLOBAL myisam_max_sort_file_size=default;
 --replace_result 2147483647 FILE_SIZE 9223372036853727232 FILE_SIZE
 show global variables like 'myisam_max_sort_file_size';
 --replace_result 2147483647 FILE_SIZE 9223372036853727232 FILE_SIZE
-select * from information_schema.session_variables where variable_name like 'myisam_max_sort_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;
 set global net_buffer_length=1024, net_write_timeout=200, net_read_timeout=300;