From 736ca14323fa16e409378f0da8005bce4be6dcf8 Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 22 May 2020 15:42:11 +0300 Subject: 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 --- sql/sql_sequence.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sql/sql_sequence.cc') 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) { -- cgit v1.2.1