database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Simple optimization and removal of compiler warnings

Browse Source
This commit is contained in:
Monty
2015-07-05 12:40:16 +03:00
parent 86377d078e
commit 8d4d185a08
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/filesort.cc
View File

@@ -447,10 +447,11 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
void filesort_free_buffers(TABLE *table, bool full)
{
DBUG_ENTER("filesort_free_buffers");
my_free(table->sort.record_pointers);
table->sort.record_pointers= NULL;
if (full)
if (unlikely(full))
{
table->sort.free_sort_buffer();
my_free(table->sort.buffpek);
@@ -458,10 +459,14 @@ void filesort_free_buffers(TABLE *table, bool full)
table->sort.buffpek_len= 0;
}
my_free(table->sort.addon_buf);
my_free(table->sort.addon_field);
table->sort.addon_buf= NULL;
table->sort.addon_field= NULL;
/* addon_buf is only allocated if addon_field is set */
if (unlikely(table->sort.addon_field))
{
my_free(table->sort.addon_field);
my_free(table->sort.addon_buf);
table->sort.addon_buf= NULL;
table->sort.addon_field= NULL;
}
DBUG_VOID_RETURN;
}