From c95e789e631d825533eecaffd01f6b74ada61365 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Sun, 27 Mar 2016 12:07:02 +0300
Subject: [PATCH] Remove out-of date code

gbh != NULL is handled in a separate branch above,
we don't get into this part of code when gbh!=NULL
---
 sql/sql_select.cc | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index af27664a7be..f794ae91a13 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2278,22 +2278,14 @@ bool JOIN::make_aggr_tables_info()
     tmp_table_param.hidden_field_count= 
       all_fields.elements - fields_list.elements;
 
-    if (!gbh)
-    {
-      distinct= select_distinct && !group_list;
-      keep_row_order= false;
-    }
+    distinct= select_distinct && !group_list;
+    keep_row_order= false;
     if (create_postjoin_aggr_table(curr_tab,
                                    &all_fields, tmp_group, 
                                    group_list && simple_group,
                                    distinct, keep_row_order))
       DBUG_RETURN(true);
     exec_tmp_table= curr_tab->table;
-    if (gbh)
-    {
-      /* Give storage engine access to temporary table */
-      gbh->table= exec_tmp_table;
-    }
 
     if (exec_tmp_table->distinct)
       optimize_distinct();