From: Ashish Agarwal
Date: February 3 2012 1:52pm
Subject: bzr push into mysql-5.5 branch (ashish.y.agarwal:3701 to 3702) Bug#11754145
List-Archive: http://lists.mysql.com/commits/142741
X-Bug: 11754145
Message-Id: <201202031352.q13DqDC8018365@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3702 Ashish Agarwal	2012-02-03
      BUG#11754145: One of the test was failing. Patch to fix the test

    modified:
      mysql-test/include/have_32bit.inc
      mysql-test/include/have_64bit.inc
 3701 Ashish Agarwal	2012-02-02
      BUG#11754145 - 45702: IMPOSSIBE TO SPECIFY MYISAM_SORT_BUFFER > 4GB 
                            ON 64 BIT MACHINES
      
      PROBLEM: When sorting index during repair of
               myisam tables, due to improper casting
               of buffer size variables value of myisam_
               sort_buffer_size is not set greater than
               4GB.
      
      SOLUTION: Proper casting of buffer size variable.
                myisam_buffer_size changed to unsigned
                long long to handle size > 4GB on
                linux as well as windows.

    modified:
      include/myisam.h
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_check.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamdef.h
      storage/myisam/sort.c
=== modified file 'mysql-test/include/have_32bit.inc'
--- a/mysql-test/include/have_32bit.inc	2009-01-08 18:13:57 +0000
+++ b/mysql-test/include/have_32bit.inc	2012-02-03 13:49:32 +0000
@@ -3,10 +3,10 @@
 
 --disable_query_log
 --disable_warnings
-let $save = `SELECT @@global.sort_buffer_size`;
-SET @@global.sort_buffer_size = 4294967296;
-let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`;
-eval SET @@global.sort_buffer_size = $save;
+let $save = `SELECT @@global.myisam_sort_buffer_size`;
+SET @@global.myisam_sort_buffer_size = 4294967296;
+let $mach32 = `SELECT @@global.myisam_sort_buffer_size <= 4294967295`;
+eval SET @@global.myisam_sort_buffer_size = $save;
 --enable_warnings
 --enable_query_log
 if (!$mach32)

=== modified file 'mysql-test/include/have_64bit.inc'
--- a/mysql-test/include/have_64bit.inc	2009-01-08 18:13:57 +0000
+++ b/mysql-test/include/have_64bit.inc	2012-02-03 13:49:32 +0000
@@ -2,10 +2,10 @@
 # see also have_32bit.inc
 
 --disable_query_log
-let $save = `SELECT @@session.sort_buffer_size`;
-SET @@session.sort_buffer_size = 4294967296;
-let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`;
-eval SET @@session.sort_buffer_size = $save;
+let $save = `SELECT @@session.myisam_sort_buffer_size`;
+SET @@session.myisam_sort_buffer_size = 4294967296;
+let $mach64 = `SELECT @@session.myisam_sort_buffer_size > 4294967295`;
+eval SET @@session.myisam_sort_buffer_size = $save;
 --enable_query_log
 if (!$mach64)
 {

No bundle (reason: useless for push emails).