From dafed5b51591ad85ef7724156f135d5be8fe698d Mon Sep 17 00:00:00 2001
From: Igor Babaev <igor@askmonty.org>
Date: Tue, 26 Apr 2016 09:34:38 -0700
Subject: [PATCH] Removed some dead code that appeared in the merge for
 mdev-8646.

---
 sql/sql_select.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 52e035d6e75..a8be787fac4 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2119,7 +2119,6 @@ bool JOIN::make_aggr_tables_info()
   List<Item> *curr_all_fields= &all_fields;
   List<Item> *curr_fields_list= &fields_list;
   JOIN_TAB *curr_tab= join_tab + const_tables;
-  bool materialize_join= false;
   TABLE *exec_tmp_table= NULL;
   bool distinct= false;
   bool keep_row_order= false;
@@ -2377,11 +2376,6 @@ bool JOIN::make_aggr_tables_info()
       tmp_table_param.hidden_field_count= 
         tmp_all_fields1.elements - tmp_fields_list1.elements;
       
-      if (!exec_tmp_table->group && !exec_tmp_table->distinct)
-      {
-        // 1st tmp table were materializing join result
-        materialize_join= true;
-      }
       curr_tab++;
       aggr_tables++;
       bzero(curr_tab, sizeof(JOIN_TAB));