bk commit into 5.1 tree (anozdrin:1.2668)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of anozdrin.  When anozdrin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-01 13:47:11+03:00, anozdrin@quad. +1 -0
  Fix merge.

  mysql-test/t/variables.test@stripped, 2008-02-01 13:47:09+03:00, anozdrin@quad. +3 -3
    Fix merge.

diff -Nrup a/mysql-test/t/variables.test b/mysql-test/t/variables.test
--- a/mysql-test/t/variables.test	2008-02-01 13:29:26 +03:00
+++ b/mysql-test/t/variables.test	2008-02-01 13:47:09 +03:00
@@ -141,9 +141,9 @@ set GLOBAL myisam_max_sort_file_size=200
 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;