database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-12 12:00:11 +04:00
parent 51a552ddf2 7c3df72d0a
commit e33bda183e
33 changed files with 605 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_lex.cc
View File

@@ -5825,17 +5825,15 @@ sp_head *LEX::make_sp_head(THD *thd, sp_name *name,
sp_head *sp;
/* Order is important here: new - reset - init */
if ((sp= new sp_head()))
if ((sp= new sp_head(type)))
{
sp->reset_thd_mem_root(thd);
sp->init(this);
sp->m_type= type;
if (name)
sp->init_sp_name(thd, name);
sp->m_chistics= &sp_chistics;
sphead= sp;
}
bzero(&sp_chistics, sizeof(sp_chistics));
sp_chistics.init();
return sp;
}
@@ -6125,7 +6123,7 @@ bool LEX::maybe_start_compound_statement(THD *thd)
{
if (!make_sp_head(thd, NULL, TYPE_ENUM_PROCEDURE))
return true;
sp_chistics.suid= SP_IS_NOT_SUID;
sphead->set_suid(SP_IS_NOT_SUID);
sphead->set_body_start(thd, thd->m_parser_state->m_lip.get_cpp_ptr());
}
return false;