diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
| commit | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch) | |
| tree | f0b9f34521554ce94ef9a5bd6c7e5f595459240f /sql/sql_sequence.cc | |
| parent | ea7830eef48333e28f98a9b91f05a95735b465a3 (diff) | |
| parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
| download | mariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz | |
Merge 10.3 into 10.4
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 035fb1211e6..0b73f3ef629 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -355,8 +355,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) { |