diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-10-25 07:33:35 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-10-25 12:58:10 +0300 |
| commit | 8c5d323326d9d527e9a5e08c69eb6085953eb130 (patch) | |
| tree | 60498008da723ca3b5534c35949101dd55758c09 /sql | |
| parent | 667d3fbbb51044b20d23150992adbbad1f04aad8 (diff) | |
| download | mariadb-git-8c5d323326d9d527e9a5e08c69eb6085953eb130.tar.gz | |
Additional fixes
* galera_many_rows : reduce the time used
* wsrep_thd.cc : remove incorrect assertion
* disabled.def : disable failing test cases
Diffstat (limited to 'sql')
| -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 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() || |