Merge BUG#27525856 from mysql-8.0 into mysql-trunk

Author: Sven Sandberg

mysql-test/extra/rpl_tests/rpl_perfschema_applier_xa_status.test

@@ -20,54 +20,63 @@
 --source include/rpl_connection_slave.inc
 TRUNCATE TABLE performance_schema.events_transactions_current;
 
+--echo ---- Setup ----
 --source include/rpl_connection_master.inc
 --let $master_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
 CREATE TABLE t ( f INT) ENGINE=INNODB;
+
+--echo ---- XA PREPARE ----
 XA START 'xatest';
 INSERT INTO t VALUES (10);
 XA END 'xatest';
 XA PREPARE 'xatest';
---let $master_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
---let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
 
---source include/rpl_connection_slave.inc
---echo # Wait until SQL thread reaches desired master binlog position
---let $slave_param= Relay_Master_Log_File
---let $slave_param_value= $master_file
---let $slave_param_comparison= =
---source include/wait_for_slave_param.inc
+# Sync on a different connection, since we can't run queries on a
+# connection that has an XA transaction in PREPARED state.
+--connection default
+--source include/sync_slave_sql_with_master.inc
 
---let $slave_param= Exec_Master_Log_Pos
---let $slave_param_value= $master_pos
---let $slave_param_comparison= >=
---source include/wait_for_slave_param.inc
+--echo # Wait for XA_STATE to become PREPARED on slave
+# It is not enough to only use sync_slave_sql_with_master.inc, because
+# the XA state is updated after the GTID state and the replication
+# positions.  Hence we also *wait* for the XA state to change.
+--let $wait_condition = SELECT COUNT(*) = 1 FROM performance_schema.events_transactions_current WHERE XID_GTRID = 'xatest' AND XA_STATE = 'PREPARED'
+--source include/wait_condition_or_abort.inc
 
+--echo # Expecting one prepared transaction
 XA RECOVER;
---echo ####################################################################
---echo # Asserting XA_STATE is PREPARED on Slave
---echo ####################################################################
---let $assert_text= Verify that XA_STATE is set PREPARED.
---let $assert_cond=count(*)=1 FROM performance_schema.events_transactions_current WHERE XID_GTRID=\'xatest\' AND XA_STATE=\'PREPARED\'
---source include/assert.inc
 
+if ($gtid_mode == ON)
+{
+  --let $gno_0 = 2
+  --let $expected_gtid = $master_uuid:$gno_0
+  --echo Waiting until gtid is MASTER_UUID:$gno_0
+  --let $wait_condition = SELECT GTID = '$expected_gtid' FROM performance_schema.events_transactions_current where XID_GTRID = 'xatest' AND XA_STATE = 'PREPARED'
+  --source include/wait_condition_or_abort.inc
+}
+
+--echo ---- XA COMMIT ----
 --source include/rpl_connection_master.inc
 XA COMMIT 'xatest';
 --source include/sync_slave_sql_with_master.inc
+
+--echo # Wait for XA_STATE to become COMMITTED on slave
+--let $wait_condition = SELECT COUNT(*) = 1 FROM performance_schema.events_transactions_current WHERE XID_GTRID = 'xatest' AND XA_STATE = 'COMMITTED'
+--source include/wait_condition_or_abort.inc
+
+--echo # Expecting no prepared transactions
 XA RECOVER;
---echo ####################################################################
---echo # Asserting XA_STATE is COMMITTED on Slave
---echo ####################################################################
---let $assert_text= Verify that XA_STATE is set COMMITTED.
---let $assert_cond=count(*)=1 FROM performance_schema.events_transactions_current WHERE XID_GTRID=\'xatest\' AND XA_STATE=\'COMMITTED\'
---source include/assert.inc
 
 if ($gtid_mode == ON)
 {
   --let $gno_0 = 3
   --let $expected_gtid = $master_uuid:$gno_0
-  --let $assert_text= Expected gtid is MASTER_UUID:$gno_0
-  --let $assert_cond= "[SELECT GTID FROM performance_schema.events_transactions_current where XID_GTRID=\'xatest\']" = "$expected_gtid"
-  --source include/assert.inc
+  --echo Waiting until gtid is MASTER_UUID:$gno_0
+  # We need the "XA_STATE='COMMITTED'" condition, since there
+  # can be multiple rows having XID_GTRID='xatest' in case XA PREPARE
+  # and XA COMMIT were handled by different applier worker threads.
+  --let $wait_condition = SELECT GTID = '$expected_gtid' FROM performance_schema.events_transactions_current where XID_GTRID = 'xatest' AND XA_STATE = 'COMMITTED'
+  --source include/wait_condition_or_abort.inc
 }
 
 --let $diff_tables=master:t,slave:t

mysql-test/include/dbug_crash.inc

@@ -0,0 +1,20 @@
+# ==== Purpose ====
+#
+# Crash the server of the current connection.
+#
+# This should be used only for debugging test cases, when you need the
+# core file. To stop a server as part of a test scenario, use one of
+# rpl_stop_server.inc, rpl_restart_server.inc, kill_mysqld.inc,
+# restart_mysqld.inc, etc.
+#
+# ==== Implementation ====
+#
+# This relies on a debug symbol that causes the server to call
+# DBUG_ASSERT(0).  So it only works on debug-compiled servers.
+#
+# ==== Usage ====
+#
+# [in main test: source include/have_dbug.inc]
+# --source include/dbug_crash.inc
+
+SET SESSION debug = 'd,crash_now';

mysql-test/include/dbug_crash_all.inc

@@ -0,0 +1,44 @@
+# ==== Purpose ====
+#
+# Crash all servers that were configured with rpl_init.inc/master-slave.inc.
+#
+# This should be used only for debugging test cases, when you need the
+# core file. To stop a server as part of a test scenario, use one of
+# rpl_stop_server.inc, rpl_restart_server.inc, kill_mysqld.inc,
+# restart_mysqld.inc, etc.
+#
+# ==== Implementation ====
+#
+# This relies on a debug symbol that causes the server to call
+# DBUG_ASSERT(0).  So it only works on debug-compiled servers.
+#
+# ==== Usage ====
+#
+# [in main test: source include/have_dbug.inc]
+# [--let $connection_suffix = _1]
+# --source include/dbug_crash_all.inc
+#
+# Parameters:
+#   $connection_suffix
+#     By default, uses connections server_1, server_2, etc.
+#     Set this variable to use server_1$connection_suffix,
+#     server_2$connection_suffix, etc.
+
+
+# Tell all servers to crash
+--let $_rpl_server = $rpl_server_count
+while ($_rpl_server) {
+  --connection server_$_rpl_server$server_suffix
+  --echo # Crashing server_$_rpl_server$server_suffix
+  send SET SESSION debug = 'd,crash_now';
+  --dec $_rpl_server
+}
+
+# Wait until connection drops
+--let $_rpl_server = $rpl_server_count
+while ($_rpl_server) {
+  --connection server_$_rpl_server$server_suffix
+  --error 0,1040,1053,2002,2003,2006,2013,2016,2017
+  --reap
+  --dec $_rpl_server
+}

mysql-test/include/show_rpl_debug_info.inc

@@ -32,6 +32,9 @@
 #     with the current connection. If this variable is set, debug
 #     info is printed only for the current connection.
 #
+#   $crash_after_show_rpl_debug_info
+#     Crash all servers at the end (using include/dbug_crash_all.inc)
+#
 #   $extra_debug_info
 #     This text is printed verbatim to the output. Useful for helper
 #     scripts to supply extra diagnostic output.
@@ -198,5 +201,10 @@ if ($extra_debug_eval)
   --echo extra evaluated debug info: '$eval_result'
 }
 
+if ($crash_after_show_rpl_debug_info)
+{
+ --source include/dbug_crash_all.inc
+}
+
 --connection $_rpl_old_con
 --enable_abort_on_error

mysql-test/suite/rpl_gtid/r/rpl_gtid_perfschema_applier_xa_status.result

@@ -5,33 +5,30 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection master]
 [connection slave]
 TRUNCATE TABLE performance_schema.events_transactions_current;
+---- Setup ----
 [connection master]
 CREATE TABLE t ( f INT) ENGINE=INNODB;
+---- XA PREPARE ----
 XA START 'xatest';
 INSERT INTO t VALUES (10);
 XA END 'xatest';
 XA PREPARE 'xatest';
-[connection slave]
-# Wait until SQL thread reaches desired master binlog position
-include/wait_for_slave_param.inc [Relay_Master_Log_File]
-include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
+include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become PREPARED on slave
+# Expecting one prepared transaction
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
 1	6	0	xatest
-####################################################################
-# Asserting XA_STATE is PREPARED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set PREPARED.]
+Waiting until gtid is MASTER_UUID:2
+---- XA COMMIT ----
 [connection master]
 XA COMMIT 'xatest';
 include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become COMMITTED on slave
+# Expecting no prepared transactions
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
-####################################################################
-# Asserting XA_STATE is COMMITTED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set COMMITTED.]
-include/assert.inc [Expected gtid is MASTER_UUID:3]
+Waiting until gtid is MASTER_UUID:3
 include/diff_tables.inc [master:t,slave:t]
 [connection master]
 DROP TABLE t;
@@ -52,33 +49,30 @@ SET GLOBAL slave_parallel_type='DATABASE';
 include/start_slave.inc
 [connection slave]
 TRUNCATE TABLE performance_schema.events_transactions_current;
+---- Setup ----
 [connection master]
 CREATE TABLE t ( f INT) ENGINE=INNODB;
+---- XA PREPARE ----
 XA START 'xatest';
 INSERT INTO t VALUES (10);
 XA END 'xatest';
 XA PREPARE 'xatest';
-[connection slave]
-# Wait until SQL thread reaches desired master binlog position
-include/wait_for_slave_param.inc [Relay_Master_Log_File]
-include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
+include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become PREPARED on slave
+# Expecting one prepared transaction
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
 1	6	0	xatest
-####################################################################
-# Asserting XA_STATE is PREPARED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set PREPARED.]
+Waiting until gtid is MASTER_UUID:2
+---- XA COMMIT ----
 [connection master]
 XA COMMIT 'xatest';
 include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become COMMITTED on slave
+# Expecting no prepared transactions
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
-####################################################################
-# Asserting XA_STATE is COMMITTED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set COMMITTED.]
-include/assert.inc [Expected gtid is MASTER_UUID:3]
+Waiting until gtid is MASTER_UUID:3
 include/diff_tables.inc [master:t,slave:t]
 [connection master]
 DROP TABLE t;
@@ -96,33 +90,30 @@ SET GLOBAL slave_parallel_type='LOGICAL_CLOCK';
 include/start_slave.inc
 [connection slave]
 TRUNCATE TABLE performance_schema.events_transactions_current;
+---- Setup ----
 [connection master]
 CREATE TABLE t ( f INT) ENGINE=INNODB;
+---- XA PREPARE ----
 XA START 'xatest';
 INSERT INTO t VALUES (10);
 XA END 'xatest';
 XA PREPARE 'xatest';
-[connection slave]
-# Wait until SQL thread reaches desired master binlog position
-include/wait_for_slave_param.inc [Relay_Master_Log_File]
-include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
+include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become PREPARED on slave
+# Expecting one prepared transaction
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
 1	6	0	xatest
-####################################################################
-# Asserting XA_STATE is PREPARED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set PREPARED.]
+Waiting until gtid is MASTER_UUID:2
+---- XA COMMIT ----
 [connection master]
 XA COMMIT 'xatest';
 include/sync_slave_sql_with_master.inc
+# Wait for XA_STATE to become COMMITTED on slave
+# Expecting no prepared transactions
 XA RECOVER;
 formatID	gtrid_length	bqual_length	data
-####################################################################
-# Asserting XA_STATE is COMMITTED on Slave
-####################################################################
-include/assert.inc [Verify that XA_STATE is set COMMITTED.]
-include/assert.inc [Expected gtid is MASTER_UUID:3]
+Waiting until gtid is MASTER_UUID:3
 include/diff_tables.inc [master:t,slave:t]
 [connection master]
 DROP TABLE t;

sql/sql_parse.cc

@@ -3277,6 +3277,15 @@ int mysql_execute_command(THD *thd, bool first_level) {
         goto error;
       }
 
+#ifndef DBUG_OFF
+      /*
+        Makes server crash when executing SET SESSION debug = 'd,crash_now';
+        See mysql-test/include/dbug_crash[_all].inc
+      */
+      bool force_server_crash_dbug = false;
+      DBUG_EXECUTE_IF("crash_now", DBUG_ASSERT(force_server_crash_dbug););
+#endif
+
       break;
     }
     case SQLCOM_SET_PASSWORD: {