From 4e1be6221e8d683e525c9e0113ab48ae78e99f39 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Feb 2008 12:27:52 +0300 Subject: [PATCH] Fix merge: fix test. --- mysql-test/t/variables.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 4ae91dbcb69..51f8d6db1db 100644 --- a/mysql-test/t/variables.test +++ b/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;