diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-12 12:00:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-12 12:00:11 +0400 |
| commit | e33bda183e80ff63a984ed2a938467950b23a3fd (patch) | |
| tree | 940df9237ea3827324e93825db466e902854c0df /sql/sql_lex.cc | |
| parent | 51a552ddf21ed698f285e562d053b6e3a1e07726 (diff) | |
| parent | 7c3df72d0a627aa6c12af14d57b2664af7f8b380 (diff) | |
| download | mariadb-git-e33bda183e80ff63a984ed2a938467950b23a3fd.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ef7a9bef10f..2fe788264d3 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -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; |