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

Conflicts:
	sql/sp_rcontext.cc

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index d82fffc69b0..62b5439d84d 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -68,6 +68,7 @@ sp_rcontext *sp_rcontext::create(THD *thd,
                                  Field *return_value_fld,
                                  Row_definition_list &field_def_lst)
 {
+  SELECT_LEX *save_current_select;
   sp_rcontext *ctx= new (thd->mem_root) sp_rcontext(owner,
                                                     root_parsing_ctx,
                                                     return_value_fld,
@@ -75,14 +76,19 @@ sp_rcontext *sp_rcontext::create(THD *thd,
   if (!ctx)
     return NULL;
 
+  /* Reset current_select as it's checked in Item_ident::Item_ident */
+  save_current_select= thd->lex->current_select;
+  thd->lex->current_select= 0;
+
   if (ctx->alloc_arrays(thd) ||
       ctx->init_var_table(thd, field_def_lst) ||
       ctx->init_var_items(thd, field_def_lst))
   {
     delete ctx;
-    return NULL;
+    ctx= 0;
   }
 
+  thd->lex->current_select= save_current_select;
   return ctx;
 }