diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
| commit | 4a0b56f60436cab3f2f60b15ec699cb19c1e10ba (patch) | |
| tree | 141f7f177748f763dab14484514453cec367c585 /sql/sql_sequence.cc | |
| parent | 0bf843cd13981b03920bfc49c646b28a130f5d47 (diff) | |
| parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
| download | mariadb-git-4a0b56f60436cab3f2f60b15ec699cb19c1e10ba.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index dd12cb85558..e351a0332e6 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -354,8 +354,10 @@ bool sequence_insert(THD *thd, LEX *lex, TABLE_LIST *org_table_list) seq->reserved_until= seq->start; error= seq->write_initial_sequence(table); - trans_commit_stmt(thd); - trans_commit_implicit(thd); + if (trans_commit_stmt(thd)) + error= 1; + if (trans_commit_implicit(thd)) + error= 1; if (!temporary_table) { |