merge

1 files changed, 1 insertions, 11 deletions

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 28425743c87..72e82dbfe04 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9052,11 +9052,9 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top)
   }
     
   /* Flatten nested joins that can be flattened. */
-  TABLE_LIST *right_neighbor= NULL;
   li.rewind();
   while ((table= li++))
   {
-    bool fix_name_res= FALSE;
     nested_join= table->nested_join;
     if (nested_join && !table->on_expr)
     {
@@ -9071,15 +9069,7 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top)
         tbl->dep_tables|= table->dep_tables;
       }
       li.replace(nested_join->join_list);
-      /* Need to update the name resolution table chain when flattening joins */
-      fix_name_res= TRUE;
-      table= *li.ref();
-    }
-    if (fix_name_res)
-      table->next_name_resolution_table= right_neighbor ?
-        right_neighbor->first_leaf_for_name_resolution() :
-        NULL;
-    right_neighbor= table;
+    }
   }
   DBUG_RETURN(conds); 
 }