From 8c5d323326d9d527e9a5e08c69eb6085953eb130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 25 Oct 2022 07:33:35 +0300
Subject: Additional fixes

* galera_many_rows : reduce the time used
* wsrep_thd.cc : remove incorrect assertion
* disabled.def : disable failing test cases
---
 sql/wsrep_thd.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sql/wsrep_thd.h')

diff --git a/sql/wsrep_thd.h b/sql/wsrep_thd.h
index 31f95510c5e..e9add662e3f 100644
--- a/sql/wsrep_thd.h
+++ b/sql/wsrep_thd.h
@@ -184,7 +184,6 @@ void wsrep_reset_threadvars(THD *);
 
 static inline void wsrep_override_error(THD *thd, uint error, const char *format= 0, ...)
 {
-  DBUG_ASSERT(error != ER_ERROR_DURING_COMMIT);
   Diagnostics_area *da= thd->get_stmt_da();
   if (da->is_ok() ||
       da->is_eof() ||
-- 
cgit v1.2.1