Fix the merge error in 2bd4dc38 (Merge branch '10.2' into bb-10.2-mdev9543)

9b5951c3 · Sergei Petrunia · 3450c2da · 9b5951c3
Commit 9b5951c3 authored 8 years ago by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/sql_select.cc sql/sql_select.cc +0 -2

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -11421,8 +11421,6 @@ void JOIN_TAB::cleanup()
  select= 0;
  delete quick;
  quick= 0;
-  delete filesort;
-  filesort= 0;
  if (cache)
  {
    cache->free();