Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

1 files changed, 0 insertions, 16 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 47286f1df14..909ef887928 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -1793,22 +1793,6 @@ void st_select_lex_unit::reinit_exec_mechanism()
 {
   prepared= optimized= optimized_2= executed= 0;
   optimize_started= 0;
-#ifndef DBUG_OFF
-  if (is_unit_op())
-  {
-    List_iterator_fast<Item> it(item_list);
-    Item *field;
-    while ((field= it++))
-    {
-      /*
-	we can't cleanup here, because it broke link to temporary table field,
-	but have to drop fixed flag to allow next fix_field of this field
-	during re-executing
-      */
-      field->fixed= 0;
-    }
-  }
-#endif
   if (with_element && with_element->is_recursive)
     with_element->reset_recursive_for_exec();
 }