bk commit into 5.1 tree (sergefp:1.2540) BUG#29610

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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, 2007-07-11 15:16:54+04:00, sergefp@stripped +1 -0
  BUG#29610: crash in func_group on 64bit platform:
  - make merge_buffers():sort_length have type size_t as this type is 
    expected by, e.g. ptr_compare_1, which will receive pointer to 
    sort_length as comparison parameter.

  sql/filesort.cc@stripped, 2007-07-11 15:16:47+04:00, sergefp@stripped +2 -1
    BUG#29610: crash in func_group on 64bit platform:
    - make sort_length have type size_t as this type is expected by, e.g.
      ptr_compare_1, which will receive pointer to sort_length as comparison
      parameter.

diff -Nrup a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc	2007-07-04 12:40:10 +04:00
+++ b/sql/filesort.cc	2007-07-11 15:16:47 +04:00
@@ -1120,7 +1120,8 @@ int merge_buffers(SORTPARAM *param, IO_C
                   int flag)
 {
   int error;
-  uint rec_length,sort_length,res_length,offset;
+  uint rec_length,res_length,offset;
+  size_t sort_length;
   ulong maxcount;
   ha_rows max_rows,org_max_rows;
   my_off_t to_start_filepos;