From: Date: May 17 2007 11:54pm
Subject: bk commit into 5.0 tree (dkatz:1.2487) BUG#27119
List-Archive: http://lists.mysql.com/commits/26932
X-Bug: 27119
Message-Id: <20070517215436.EB10E3DE5D0@damien-katzs-computer.local>

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz 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-05-17 17:54:31-04:00, dkatz@stripped +1 -0
  Bug #27119  	server crash with integer division by zero during filesort on huge result
  
  Fixed a compiler warning on platforms where uint != ulong from the first pushed fix.

  sql/filesort.cc@stripped, 2007-05-17 17:54:27-04:00, dkatz@stripped +1 -1
    fixed a compiler warning on platforms where uint != ulong

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dkatz
# Host:	damien-katzs-computer.local
# Root:	/Users/dkatz/50_div_zero

--- 1.118/sql/filesort.cc	2007-05-16 16:14:09 -04:00
+++ 1.119/sql/filesort.cc	2007-05-17 17:54:27 -04:00
@@ -370,7 +370,7 @@ static BUFFPEK *read_buffpek_from_file(I
   ulong length;
   BUFFPEK *tmp;
   DBUG_ENTER("read_buffpek_from_file");
-  if (count > ULONG_MAX/sizeof(BUFFPEK))
+  if ((ulong)count > ULONG_MAX/sizeof(BUFFPEK))
     return 0; /* sizeof(BUFFPEK)*count will overflow */
   tmp=(BUFFPEK*) my_malloc(length=sizeof(BUFFPEK)*count, MYF(MY_WME));
   if (tmp)