Merge 10.1 into 10.2

1 files changed, 0 insertions, 12 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 2ff9d4e4a44..08316d95276 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -7583,18 +7583,6 @@ bool Item_ref::fix_fields(THD *thd, Item **reference)
                       last_checked_context->select_lex->nest_level);
     }
   }
-  else if (ref_type() != VIEW_REF)
-  {
-    /*
-      It could be that we're referring to something that's in ancestor selects.
-      We must make an appropriate mark_as_dependent() call for each such
-      outside reference.
-    */
-    Dependency_marker dep_marker;
-    dep_marker.current_select= current_sel;
-    dep_marker.thd= thd;
-    (*ref)->walk(&Item::enumerate_field_refs_processor, FALSE, &dep_marker);
-  }
 
   DBUG_ASSERT(*ref);
   /*