MDEV-30423 Deadlock on Replica during BACKUP STAGE BLOCK_COMMIT on XA transactions

The user XA commit execution branch was caught not have been covered
with MDEV-21953 fixes.

The XA involved deadlock is resolved now to apply the former fixes
pattern.
Along the fixes the following changes have been implemented.
- MDL lock attribute correction
- dissociation of the externally completed XA from the current
  thread's xid_state in the error branches
- cleanup_context() preseves the prepared XA
- wait_for_prior_commit() is relocated to satisfy both
  the binlog ON (log-slave-updates and skip-log-bin)
  and OFF slave execution branches.

2 files changed, 16 insertions, 1 deletions

diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index 9ed206b2c22..17c8dd3ed4e 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -11,6 +11,7 @@
 #   [--let $rpl_skip_start_slave= 1]
 #   [--let $rpl_debug= 1]
 #   [--let $slave_timeout= NUMBER]
+#   [--let $rpl_server_skip_log_bin= 1]
 #   --source include/master-slave.inc
 #
 # Parameters:
diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc
index 4ee4cccdc20..acb9104ae6f 100644
--- a/mysql-test/include/rpl_init.inc
+++ b/mysql-test/include/rpl_init.inc
@@ -73,6 +73,7 @@
 #      before CHANGE MASTER and START SLAVE.  RESET MASTER and RESET
 #      SLAVE are suppressed if $rpl_skip_reset_master_and_slave is
 #      set.
+#      Also see $rpl_server_skip_log_bin.
 #
 #    $rpl_skip_change_master
 #      By default, this script issues CHANGE MASTER so that all slaves
@@ -94,6 +95,10 @@
 #      Timeout used when waiting for the slave threads to start.
 #      See include/wait_for_slave_param.inc
 #
+#    $rpl_server_skip_log_bin
+#      When $rpl_skip_reset_master_and_slave is not set
+#      RESET MASTER does not report ER_FLUSH_MASTER_BINLOG_CLOSED
+#      on any server.
 #
 # ==== Side effects ====
 #
@@ -161,7 +166,16 @@ while ($_rpl_server)
   USE test;
   if (!$rpl_skip_reset_master_and_slave)
   {
-    RESET MASTER;
+    if (!$rpl_server_skip_log_bin)
+    {
+     --error 0
+       RESET MASTER;
+    }
+    if ($rpl_server_skip_log_bin)
+    {
+     --error 0,ER_FLUSH_MASTER_BINLOG_CLOSED
+       RESET MASTER;
+    }
     SET GLOBAL gtid_slave_pos= "";
     RESET SLAVE;
   }