Merge branch 'mysql-5.6' into mysql-5.7

Author: Sreeharsha Ramanavarapu

sql/item_subselect.cc

@@ -299,6 +299,7 @@ bool Item_in_subselect::finalize_materialization_transform(JOIN *join)
       For some reason we cannot use materialization for this IN predicate.
       Delete all materialization-related objects, and return error.
     */
+    new_engine->cleanup();
     delete new_engine;
     return true;
   }
@@ -3837,19 +3838,19 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
   QEP_TAB_standalone *tmp_tab_st= new (thd->mem_root) QEP_TAB_standalone;
   if (tmp_tab_st == NULL)
     DBUG_RETURN(TRUE);
-  QEP_TAB *const tmp_tab= &tmp_tab_st->as_QEP_TAB();
-  tmp_tab->set_table(tmp_table);
-  tmp_tab->ref().key= 0; /* The only temp table index. */
-  tmp_tab->ref().key_length= tmp_key->key_length;
-  if (!(tmp_tab->ref().key_buff=
+  tab= &tmp_tab_st->as_QEP_TAB();
+  tab->set_table(tmp_table);
+  tab->ref().key= 0; /* The only temp table index. */
+  tab->ref().key_length= tmp_key->key_length;
+  if (!(tab->ref().key_buff=
         (uchar*) thd->mem_calloc(key_length)) ||
-      !(tmp_tab->ref().key_copy=
+      !(tab->ref().key_copy=
         (store_key**) thd->alloc((sizeof(store_key*) * tmp_key_parts))) ||
-      !(tmp_tab->ref().items=
+      !(tab->ref().items=
         (Item**) thd->alloc(sizeof(Item*) * tmp_key_parts)))
     DBUG_RETURN(TRUE);
 
-  uchar *cur_ref_buff= tmp_tab->ref().key_buff;
+  uchar *cur_ref_buff= tab->ref().key_buff;
 
   /*
     Like semijoin-materialization-lookup (see create_subquery_equalities()),
@@ -3897,11 +3898,11 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
     Item_field *right_col_item;
     Field *field= tmp_table->visible_field_ptr()[part_no];
     const bool nullable= field->real_maybe_null();
-    tmp_tab->ref().items[part_no]= item_in->left_expr->element_index(part_no);
+    tab->ref().items[part_no]= item_in->left_expr->element_index(part_no);
 
     if (!(right_col_item= new Item_field(thd, context, 
                                          field)) ||
-        !(eq_cond= new Item_func_eq(tmp_tab->ref().items[part_no],
+        !(eq_cond= new Item_func_eq(tab->ref().items[part_no],
                                     right_col_item)) ||
         ((Item_cond_and*)cond)->add(eq_cond))
     {
@@ -3911,15 +3912,15 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
     }
 
     if (tmp_table->hash_field)
-      tmp_tab->ref().key_copy[part_no]= 
+      tab->ref().key_copy[part_no]=
         new store_key_hash_item(thd, field,
                            cur_ref_buff,
                            0,
                            field->pack_length(),
-                           tmp_tab->ref().items[part_no],
+                           tab->ref().items[part_no],
                            &hash);
     else
-      tmp_tab->ref().key_copy[part_no]= 
+      tab->ref().key_copy[part_no]=
         new store_key_item(thd, field,
                            /* TODO:
                               the NULL byte is taken into account in
@@ -3930,20 +3931,20 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
                            cur_ref_buff + (nullable ? 1 : 0),
                            nullable ? cur_ref_buff : 0,
                            key_parts[part_no].length,
-                           tmp_tab->ref().items[part_no]);
+                           tab->ref().items[part_no]);
     if (nullable &&          // nullable column in tmp table,
         // and UNKNOWN should not be interpreted as FALSE
         !item_in->is_top_level_item())
     {
       // It must be the single column, or we wouldn't be here
       DBUG_ASSERT(tmp_key_parts == 1);
       // Be ready to search for NULL into inner column:
-      tmp_tab->ref().null_ref_key= cur_ref_buff;
+      tab->ref().null_ref_key= cur_ref_buff;
       mat_table_has_nulls= NEX_UNKNOWN;
     }
     else
     {
-      tmp_tab->ref().null_ref_key= NULL;
+      tab->ref().null_ref_key= NULL;
       mat_table_has_nulls= NEX_IRRELEVANT_OR_FALSE;
     }
 
@@ -3952,15 +3953,12 @@ bool subselect_hash_sj_engine::setup(List<Item> *tmp_columns)
     else
       cur_ref_buff+= key_parts[part_no].store_length;
   }
-  tmp_tab->ref().key_err= 1;
-  tmp_tab->ref().key_parts= tmp_key_parts;
+  tab->ref().key_err= 1;
+  tab->ref().key_parts= tmp_key_parts;
 
   if (cond->fix_fields(thd, &cond))
     DBUG_RETURN(TRUE);
 
-  // Set 'tab' only when function cannot fail, because of assert in destructor
-  tab= tmp_tab;
-
   /*
     Create and optimize the JOIN that will be used to materialize
     the subquery if not yet created.