Merge 10.1 into 10.2

This commit is contained in:
Marko Mäkelä 2017-09-06 19:28:51 +03:00
commit 70db1e3b8a
33 changed files with 214 additions and 239 deletions

View file

@ -760,6 +760,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, sql_mode_t sql_mode,
else
{
sp= thd->lex->sphead;
sp->set_select_number(thd->select_number);
}
thd->pop_internal_handler();