diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:37:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 08:37:35 +0200 |
| commit | 9aea7d83c8d006519bdf1f3269136b3756ed7548 (patch) | |
| tree | 2d4e35bbf1a3971802a542cfdf78a6790855c8a3 /sql/sql_yacc.yy | |
| parent | 24fe53477c07f700e50beb172cb6e0cf3fb1d409 (diff) | |
| parent | 41028d70f6e4ec866775bc8f9d00739ad3dbe0c2 (diff) | |
| download | mariadb-git-9aea7d83c8d006519bdf1f3269136b3756ed7548.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b935fc8795..cad4e9efd33 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -19204,6 +19204,7 @@ package_implementation_function_body: sp_head *sp= pkg->m_current_routine->sphead; thd->lex= pkg->m_current_routine; sp->reset_thd_mem_root(thd); + sp->set_c_chistics(thd->lex->sp_chistics); sp->set_body_start(thd, YYLIP->get_cpp_tok_start()); } sp_body opt_package_routine_end_name @@ -19222,6 +19223,7 @@ package_implementation_procedure_body: sp_head *sp= pkg->m_current_routine->sphead; thd->lex= pkg->m_current_routine; sp->reset_thd_mem_root(thd); + sp->set_c_chistics(thd->lex->sp_chistics); sp->set_body_start(thd, YYLIP->get_cpp_tok_start()); } sp_body opt_package_routine_end_name |