1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
This commit is contained in:
epotemkin@bk-internal.mysql.com 2008-01-10 18:03:26 +01:00
commit a714053711
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/filesort.cc
View File

@ -245,10 +245,14 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
} }
else else
{ {
if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)
{
x_free(table_sort.buffpek);
table_sort.buffpek= 0;
}
if (!(table_sort.buffpek= if (!(table_sort.buffpek=
(uchar *) read_buffpek_from_file(&buffpek_pointers, maxbuffer, (uchar *) read_buffpek_from_file(&buffpek_pointers, maxbuffer,
(table_sort.buffpek_len < maxbuffer ? table_sort.buffpek)))
NULL : table_sort.buffpek))))
goto err; goto err;
buffpek= (BUFFPEK *) table_sort.buffpek; buffpek= (BUFFPEK *) table_sort.buffpek;
table_sort.buffpek_len= maxbuffer; table_sort.buffpek_len= maxbuffer;