diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-30 09:46:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-30 09:46:52 +0100 |
| commit | a576a1cea5b0f06fb8fff0fbdb9035d89510b83a (patch) | |
| tree | d25987402c55bdaec0897ab28c236acfa50116ef /sql/sql_sequence.cc | |
| parent | 12cad0c3468d734e041d4ef0cd5a26d2a28606fc (diff) | |
| parent | 41a163ac5ccf4ac5394edc84e40b3f47acea6b08 (diff) | |
| download | mariadb-git-a576a1cea5b0f06fb8fff0fbdb9035d89510b83a.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 8d1a67eab85..03f2f1b117f 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -365,9 +365,14 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *org_table_list) seq->reserved_until= seq->start; error= seq->write_initial_sequence(table); - - if (trans_commit_stmt(thd)) - error= 1; + { + uint save_unsafe_rollback_flags= + thd->transaction.stmt.m_unsafe_rollback_flags; + if (trans_commit_stmt(thd)) + error= 1; + thd->transaction.stmt.m_unsafe_rollback_flags= + save_unsafe_rollback_flags; + } if (trans_commit_implicit(thd)) error= 1; |