Merge branch 'github/10.1' into 10.2

This commit is contained in:
Sergei Golubchik 2018-02-06 14:50:50 +01:00
commit 4771ae4b22
466 changed files with 9384 additions and 3636 deletions

View file

@ -760,7 +760,6 @@ 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();