Merge remote-tracking branch '5.5' into 10.0

1 files changed, 0 insertions, 16 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 16de451211f..01de3098783 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -941,22 +941,6 @@ bool st_select_lex_unit::cleanup()
 void st_select_lex_unit::reinit_exec_mechanism()
 {
   prepared= optimized= executed= 0;
-#ifndef DBUG_OFF
-  if (is_union())
-  {
-    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
 }