Skip to content

Commit ae098b4

Browse files
author
Jan Lindström
committed
MDEV-24062: : Galera test failure on galera_var_replicate_myisam_on
10.5 version
1 parent aae72f8 commit ae098b4

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ galera_trigger : MDEV-24048 galera.galera_trigger MTR fails: Result content mism
3434
galera_var_ignore_apply_errors : MDEV-26770 galera_var_ignore_apply_errors fails Server did not transition to READY state
3535
galera_var_node_address : MDEV-20485 Galera test failure
3636
galera_var_notify_cmd : MDEV-21905 Galera test galera_var_notify_cmd causes hang
37-
galera_var_replicate_myisam_on : MDEV-24062 Galera test failure on galera_var_replicate_myisam_on
3837
galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit
3938
mysql-wsrep#198 : MDEV-24446: galera.mysql-wsrep#198 MTR failed: query 'reap' failed: 2000: Unknown MySQL error
4039
partition : MDEV-19958 Galera test failure on galera.partition

sql/wsrep_trans_observer.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,14 @@ static inline
426426
int wsrep_after_statement(THD* thd)
427427
{
428428
DBUG_ENTER("wsrep_after_statement");
429-
DBUG_RETURN(thd->wsrep_cs().state() != wsrep::client_state::s_none &&
429+
WSREP_DEBUG("wsrep_after_statement for %lu client_state %s "
430+
" client_mode %s trans_state %s",
431+
thd_get_thread_id(thd),
432+
wsrep::to_c_string(thd->wsrep_cs().state()),
433+
wsrep::to_c_string(thd->wsrep_cs().mode()),
434+
wsrep::to_c_string(thd->wsrep_cs().transaction().state()));
435+
DBUG_RETURN((thd->wsrep_cs().state() != wsrep::client_state::s_none &&
436+
thd->wsrep_cs().mode() == Wsrep_client_state::m_local) &&
430437
!thd->internal_transaction() ?
431438
thd->wsrep_cs().after_statement() : 0);
432439
}

0 commit comments

Comments
 (0)