From ef227762b1c08b6259dfebb541ebb226e390203d Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Tue, 14 Mar 2023 10:30:09 +0100 Subject: MDEV-30838 Assertion `m_thd == _current_thd()' - Update wsrep-lib which contains fix for the assertion - Fix error handling for appending fragment to streaming log, make sure tables are closed after rollback. Signed-off-by: Julius Goryavsky --- sql/wsrep_schema.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sql/wsrep_schema.cc') diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc index 40cdd6496b2..1bc8dd5c98f 100644 --- a/sql/wsrep_schema.cc +++ b/sql/wsrep_schema.cc @@ -991,10 +991,9 @@ int Wsrep_schema::append_fragment(THD* thd, Wsrep_schema_impl::store(frag_table, 3, flags); Wsrep_schema_impl::store(frag_table, 4, data.data(), data.size()); - int error; - if ((error= Wsrep_schema_impl::insert(frag_table))) { - WSREP_ERROR("Failed to write to frag table: %d", error); + if (Wsrep_schema_impl::insert(frag_table)) { trans_rollback_stmt(thd); + close_thread_tables(thd); thd->lex->restore_backup_query_tables_list(&query_tables_list_backup); DBUG_RETURN(1); } -- cgit v1.2.1