diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-10-12 10:53:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-10-12 12:11:28 +0300 |
| commit | 5fffdbc8d5cbae5b63513d5e3d023bb4c928ec90 (patch) | |
| tree | 294de0b073ca8134115dd70f80c2518c3b2ad6f1 /sql/wsrep_thd.h | |
| parent | 977c385df36dcb751720dc838521b7cb5a328cb9 (diff) | |
| download | mariadb-git-5fffdbc8d5cbae5b63513d5e3d023bb4c928ec90.tar.gz | |
Fixes after 10.4 --> 10.5 merge
* MDEV-29142 : Ignore inconsistency warning as we kill cluster
* galera_parallel_apply_3nodes : Disabled because it is unstable
* MDEV-26597 : Add missing code
* galera_sr.galera_sr_ws_size2 : Remove incorrect assertion
Diffstat (limited to 'sql/wsrep_thd.h')
| -rw-r--r-- | sql/wsrep_thd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/wsrep_thd.h b/sql/wsrep_thd.h index e55895ffbe8..fd48df1494f 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() || |