summaryrefslogtreecommitdiff
path: root/sql/sql_sequence.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-05-22 15:42:11 +0300
committerMonty <monty@mariadb.org>2020-05-22 15:42:11 +0300
commit736ca14323fa16e409378f0da8005bce4be6dcf8 (patch)
treed9b4fae8ec3a9fcc10606db1fcc5c74c5dc182a7 /sql/sql_sequence.cc
parentc7cdd049b58177acd163a89960e97fa308d95198 (diff)
downloadmariadb-git-736ca14323fa16e409378f0da8005bce4be6dcf8.tar.gz
Don't crash if creating sequence under XA
MDEV-22002 Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' failed upon CREATE TEMPORARY SEQUENCE under XA
Diffstat (limited to 'sql/sql_sequence.cc')
-rw-r--r--sql/sql_sequence.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc
index b69b52505f4..96c1cd19433 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)
{