diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-13 13:35:49 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-13 13:35:49 +0300 |
| commit | ae098b49dd2b83923c9b04f81b04dda0161ed28d (patch) | |
| tree | aedb6ac0ca508d289ad29b85e7021974085d7f09 | |
| parent | aae72f821abbee4d63a0925c06b18422d4c08ee8 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-24062-galera.tar.gz | |
MDEV-24062: : Galera test failure on galera_var_replicate_myisam_onbb-10.5-MDEV-24062-galera
10.5 version
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | sql/wsrep_trans_observer.h | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 472c0a80f75..8a6fe8e16c1 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -34,7 +34,6 @@ galera_trigger : MDEV-24048 galera.galera_trigger MTR fails: Result content mism galera_var_ignore_apply_errors : MDEV-26770 galera_var_ignore_apply_errors fails Server did not transition to READY state galera_var_node_address : MDEV-20485 Galera test failure galera_var_notify_cmd : MDEV-21905 Galera test galera_var_notify_cmd causes hang -galera_var_replicate_myisam_on : MDEV-24062 Galera test failure on galera_var_replicate_myisam_on galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit mysql-wsrep#198 : MDEV-24446: galera.mysql-wsrep#198 MTR failed: query 'reap' failed: 2000: Unknown MySQL error partition : MDEV-19958 Galera test failure on galera.partition diff --git a/sql/wsrep_trans_observer.h b/sql/wsrep_trans_observer.h index e3e076631c7..c4528b8ef2a 100644 --- a/sql/wsrep_trans_observer.h +++ b/sql/wsrep_trans_observer.h @@ -426,7 +426,14 @@ static inline int wsrep_after_statement(THD* thd) { DBUG_ENTER("wsrep_after_statement"); - DBUG_RETURN(thd->wsrep_cs().state() != wsrep::client_state::s_none && + WSREP_DEBUG("wsrep_after_statement for %lu client_state %s " + " client_mode %s trans_state %s", + thd_get_thread_id(thd), + wsrep::to_c_string(thd->wsrep_cs().state()), + wsrep::to_c_string(thd->wsrep_cs().mode()), + wsrep::to_c_string(thd->wsrep_cs().transaction().state())); + DBUG_RETURN((thd->wsrep_cs().state() != wsrep::client_state::s_none && + thd->wsrep_cs().mode() == Wsrep_client_state::m_local) && !thd->internal_transaction() ? thd->wsrep_cs().after_statement() : 0); } |