diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
| commit | a8a925dd22ae00494cc9ffdc1ff68906106a408c (patch) | |
| tree | a857c565a22ec7f6f41d3efa72053a726a346af2 /sql/sql_prepare.cc | |
| parent | 2820f30dde3148df71e1d748ac705d98d60e0787 (diff) | |
| parent | 72fa9dabadb4b0011f483ccbf1ef59e62d0ef1e0 (diff) | |
| download | mariadb-git-a8a925dd22ae00494cc9ffdc1ff68906106a408c.tar.gz | |
Merge branch bb-10.2-release into bb-10.3-release
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 9775e99afdd..bce7c6afa17 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4276,8 +4276,10 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) thd->release_transactional_locks(); } - /* Preserve CHANGE MASTER attributes */ - lex_end_stage1(lex); + /* Preserve locked plugins for SET */ + if (lex->sql_command != SQLCOM_SET_OPTION) + lex_unlock_plugins(lex); + cleanup_stmt(); thd->restore_backup_statement(this, &stmt_backup); thd->stmt_arena= old_stmt_arena; @@ -5159,7 +5161,7 @@ void Prepared_statement::deallocate_immediate() status_var_increment(thd->status_var.com_stmt_close); /* It should now be safe to reset CHANGE MASTER parameters */ - lex_end_stage2(lex); + lex_end(lex); } |