diff options
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 5156bd08ef2..0b9e515a61f 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2630,14 +2630,13 @@ my_xpath_parse_VariableReference(MY_XPATH *xpath) else { sp_variable *spv; - sp_pcontext *spc; + const Sp_rcontext_handler *rh; LEX *lex; if ((lex= thd->lex) && - (spc= lex->spcont) && - (spv= spc->find_variable(&name, false))) + (spv= lex->find_variable(&name, &rh))) { Item_splocal *splocal= new (thd->mem_root) - Item_splocal(thd, &name, spv->offset, spv->type_handler(), 0); + Item_splocal(thd, rh, &name, spv->offset, spv->type_handler(), 0); #ifdef DBUG_ASSERT_EXISTS if (splocal) splocal->m_sp= lex->sphead; |