diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:24:17 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:24:17 +0300 |
| commit | b04429434ad1ee7f49d263762a560f4ff31dd111 (patch) | |
| tree | b4018c1ddc398c4baa5d98edafd41eaee7dd88e3 /sql/sql_yacc.yy | |
| parent | bb8226deabd177d70151d5e0729bf08533954ffd (diff) | |
| parent | bde7e0ba6e94d576c4563022f38e8d81b1f6d54a (diff) | |
| download | mariadb-git-b04429434ad1ee7f49d263762a560f4ff31dd111.tar.gz | |
Merge branch '10.1' into 10.2
# Conflicts:
# sql/sp_head.cc
# sql/sql_select.cc
# sql/sql_trigger.cc
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ba349e478b8..fe7f3021be6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -226,7 +226,7 @@ static sp_head *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= sp_head::create())) { sp->reset_thd_mem_root(thd); sp->init(lex); |