diff options
author | unknown <anozdrin/alik@quad.> | 2008-02-05 12:27:52 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@quad.> | 2008-02-05 12:27:52 +0300 |
commit | 4e1be6221e8d683e525c9e0113ab48ae78e99f39 (patch) | |
tree | ed39c0fe77c225954cb1e215f6759b0057a5334d /mysql-test | |
parent | 4e8ef9c8a26984d969682fc75987bd75171fbcbe (diff) | |
download | mariadb-git-4e1be6221e8d683e525c9e0113ab48ae78e99f39.tar.gz |
Fix merge: fix test.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/variables.test | 4 |
1 files 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; |