Skip to content

Commit 6aa4f74

Browse files
committed
Bug#11745231 post-push fixes
Including: a. narrowing rpl_xa_survive_crash_debug to Linux (another sceduled bug to fix that), b. removing an unrelated to the bug fixes assert that hurts GR (another bug to fix that).
1 parent 8432bc2 commit 6aa4f74

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

mysql-test/suite/rpl/t/rpl_xa_survive_crash_debug.test

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
# There's some format specifics through show_binlog_events,
1010
# but MIXED is chosen rather to optimize.
1111
--source include/have_binlog_format_mixed.inc
12+
#
13+
# Crash-safe testing is difficult on other than Linux.
14+
# TODO: Open it back at XA-commit/rollback crash-safe bug/FR fixing.
15+
#
16+
if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
17+
{
18+
skip Need Linux;
19+
}
1220
--source include/master-slave.inc
1321

1422
--source include/rpl_connection_slave.inc

storage/innobase/trx/trx0trx.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3310,7 +3310,6 @@ trx_kill_blocking(trx_t* trx)
33103310
/* Shouldn't commit suicide either. */
33113311

33123312
ut_ad(victim_trx->mysql_thd != trx->mysql_thd);
3313-
ut_ad(trx_state_eq(victim_trx, TRX_STATE_ACTIVE));
33143313

33153314
/* Check that the transaction isn't active inside
33163315
InnoDB code. We have to wait while it is executing

0 commit comments

Comments
 (0)