From dcb0012173f871eef6a262c4a924c3ad8c9d7707 Mon Sep 17 00:00:00 2001
From: "anozdrin/alik@quad." <>
Date: Fri, 1 Feb 2008 13:47:11 +0300
Subject: [PATCH] Fix merge.

---
 mysql-test/t/variables.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index c1580390f63..fd77a8fc9e9 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 9223372036854775807 FILE_SIZE
-show variables like 'myisam_max_sort_file_size';
---replace_result 2147483647 FILE_SIZE 9223372036854775807 FILE_SIZE
+--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';
 
 set global net_retry_count=10, session net_retry_count=10;