1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index fdfbba31404..3100a4e3408 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -6876,7 +6876,11 @@ public:
     // Find which select the field is in. This is achieved by walking up 
     // the select tree and looking for the table of interest.
     st_select_lex *sel;
-    for (sel= current_select; sel; sel= sel->outer_select())
+    for (sel= current_select;
+         sel ;
+         sel= (sel->context.outer_context ?
+               sel->context.outer_context->select_lex:
+               NULL))
     {
       List_iterator<TABLE_LIST> li(sel->leaf_tables);
       TABLE_LIST *tbl;