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

Bug#17326567 MYSQL SERVER FILESORT IMPLEMENTATION HAS A VERY SERIOUS BUG

Browse Source 
The filesort implementation needs space for at least 15 records
(plus some internal overhead) in its main sort buffer.
This commit is contained in:
Tor Didriksen 2013-10-29 17:26:20 +01:00
parent cd6f3b55da
commit a44794d05e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/filesort.cc
View File

@ -1,5 +1,5 @@
/* /*
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -216,7 +216,10 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
goto err; goto err;
memavl= thd->variables.sortbuff_size; memavl= thd->variables.sortbuff_size;
min_sort_memory= max(MIN_SORT_MEMORY, param.sort_length*MERGEBUFF2); min_sort_memory=
max(MIN_SORT_MEMORY,
ALIGN_SIZE(MERGEBUFF2 * (param.rec_length + sizeof(uchar*))));
while (memavl >= min_sort_memory) while (memavl >= min_sort_memory)
{ {
ulong old_memavl; ulong old_memavl;