Commit a7140537 authored by epotemkin@bk-internal.mysql.com's avatar epotemkin@bk-internal.mysql.com
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
parents e11a6277 7f933eb3

sql/filesort.cc

+6 −2
Original line number Diff line number Diff line
@@ -245,10 +245,14 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, 
  }

  else

  {

    if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)

    {

      x_free(table_sort.buffpek);

      table_sort.buffpek= 0;

    }

    if (!(table_sort.buffpek=

          (uchar *) read_buffpek_from_file(&buffpek_pointers, maxbuffer,

                                 (table_sort.buffpek_len < maxbuffer ?

                                  NULL : table_sort.buffpek))))

                                 table_sort.buffpek)))

      goto err;

    buffpek= (BUFFPEK *) table_sort.buffpek;

    table_sort.buffpek_len= maxbuffer;