Merge damien-katzs-computer.local:/Users/dkatz/mysql50

into damien-katzs-computer.local:/Users/dkatz/mysql51

Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
b1304050 · dkatz@damien-katzs-computer.local · 0f7d068b · 155a098b · b1304050
Commit b1304050 authored May 17, 2007 by dkatz@damien-katzs-computer.local
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/filesort.cc sql/filesort.cc +1 -1

No files found.
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -376,7 +376,7 @@ static BUFFPEK *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count)
  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)