diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 14:01:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 14:01:12 +0300 |
| commit | ee87850461d0ad939a9591b92bcc946ad004016b (patch) | |
| tree | 0dd88cfc4327dd9e952b71678dc786d996d70b1a /sql | |
| parent | 6729dd894cfcb86f97d218fb51c41a461cb2f38a (diff) | |
| download | mariadb-git-ee87850461d0ad939a9591b92bcc946ad004016b.tar.gz | |
MDEV-16708: Unsupported commands for prepared statements
Follow-up patch for the bug MDEV-25197 that fixes missed restoring
of thd->cur_stmt on returning error code.
Developed by Dmitry Shulga.
This fixes up the merge d2e2d32933823623fa3598c8e2b8a5a322e435bb
and closes MDEV-25413.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_prepare.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index f825a951de0..134c96fd28f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4257,6 +4257,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) thd->restore_backup_statement(this, &stmt_backup); thd->restore_active_arena(this, &stmt_backup); thd->stmt_arena= old_stmt_arena; + thd->cur_stmt = save_cur_stmt; my_error(ER_MUST_CHANGE_PASSWORD, MYF(0)); DBUG_RETURN(true); } |