Commit 155a098b authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

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

into  damien-katzs-computer.local:/Users/dkatz/50_div_zero
parents 74f00959 971d8d00

sql/filesort.cc

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,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)