1 files changed, 2 insertions, 11 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index e0873185461..de999559b8c 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -4556,15 +4556,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd)
 
     /* Make entry for create table */
     recinfo->length=length;
-    if (field->flags & BLOB_FLAG)
-      recinfo->type= FIELD_BLOB;
-    else if (use_packed_rows &&
-             field->real_type() == MYSQL_TYPE_STRING &&
-	     length >= MIN_STRING_LENGTH_TO_PACK_ROWS)
-      recinfo->type=FIELD_SKIP_ENDSPACE;
-    else
-      recinfo->type=FIELD_NORMAL;
-
+    recinfo->type= field->tmp_engine_column_type(use_packed_rows);
     field->set_table_name(&table->alias);
   }
 
@@ -6845,8 +6837,7 @@ get_corresponding_item_for_in_subq_having(THD *thd, Item *in_item,
     Item_ref *ref=
       new (thd->mem_root) Item_ref(thd,
                                    &subq_pred->unit->first_select()->context,
-                                   NullS, NullS,
-                                   &new_item->name);
+                                   new_item->name);
     if (!ref)
       DBUG_ASSERT(0);
     return ref;