bk commit into 5.1 tree (dkatz:1.2500)

[damien]

Below is the list of changes that have just been committed into a local
5.1 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 20:50:29-04:00, dkatz@stripped +1 -0
  Merge damien-katzs-computer.local:/Users/dkatz/mysql50
  into  damien-katzs-computer.local:/Users/dkatz/mysql51
  MERGE: 1.1810.2932.13

  sql/filesort.cc@stripped, 2007-05-17 20:50:24-04:00, dkatz@stripped +0 -0
    Auto merged
    MERGE: 1.105.1.15

# 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/mysql51/RESYNC

--- 1.129/sql/filesort.cc	2007-05-17 18:11:46 -04:00
+++ 1.130/sql/filesort.cc	2007-05-17 20:50:24 -04:00
@@ -376,7 +376,7 @@ static BUFFPEK *read_buffpek_from_file(I
   ulong length;
   BUFFPEK *tmp;
   DBUG_ENTER("read_buffpek_from_file");
-  if ((ulong)count > ULONG_MAX/sizeof(BUFFPEK))
+  if (count > UINT_MAX/sizeof(BUFFPEK))
     return 0; /* sizeof(BUFFPEK)*count will overflow */
   tmp=(BUFFPEK*) my_malloc(length=sizeof(BUFFPEK)*count, MYF(MY_WME));
   if (tmp)
@@ -629,7 +629,7 @@ write_keys(SORTPARAM *param, register uc
                        MYF(MY_WME)))
     goto err;                                   /* purecov: inspected */
   /* check we won't have more buffpeks than we can possibly keep in memory */
-  if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)ULONG_MAX)
+  if (my_b_tell(buffpek_pointers) + sizeof(BUFFPEK) > (ulonglong)UINT_MAX)
     goto err;
   buffpek.file_pos= my_b_tell(tempfile);
   if ((ha_rows) count > param->max_rows)