Skip to content

Commit 862d1be

Browse files
committed
MDEV-25718 addendum: stabilization of test success (especially for 11.4+)
Added DEBUG_SYNC_С("ha_write_row_end") in the WSREP branch, and added a new status to the list of pending statuses in the mtr test.
1 parent 779ae4c commit 862d1be

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

mysql-test/suite/galera_sr/t/MDEV-25718.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ SET SESSION wsrep_sync_wait = 0;
4343
SET debug_sync = "now SIGNAL write_row_continue";
4444

4545
# Let's give the INSERT some time, to make sure it does rollback
46-
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = "INSERT INTO t1 VALUES (1)" AND (STATE = "Freeing items" OR STATE = 'Rollback');
46+
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = "INSERT INTO t1 VALUES (1)" AND (STATE = 'Freeing items' OR STATE = 'Rollback' OR STATE = 'Query end');
4747
--let $wait_condition_on_error_output = SELECT INFO, STATE FROM INFORMATION_SCHEMA.PROCESSLIST
4848
--source include/wait_condition_with_debug.inc
4949

sql/handler.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7375,6 +7375,7 @@ int handler::ha_write_row(const uchar *buf)
73757375
ht->flags & HTON_WSREP_REPLICATION &&
73767376
!error && (error= wsrep_after_row(ha_thd())))
73777377
{
7378+
DEBUG_SYNC_C("ha_write_row_end");
73787379
DBUG_RETURN(error);
73797380
}
73807381
#endif /* WITH_WSREP */

0 commit comments

Comments
 (0)