summaryrefslogtreecommitdiff
path: root/mysql-test/suite/multi_source
diff options
context:
space:
mode:
authorSujatha <sujatha.sivakumar@mariadb.com>2020-11-24 17:22:47 +0530
committerSujatha <sujatha.sivakumar@mariadb.com>2020-11-24 17:22:47 +0530
commitae51d2b279c4d5b71c7cac7395a916649951a8df (patch)
tree941b412b5fbffa48760d8a6a790a0a9efdd9e821 /mysql-test/suite/multi_source
parent0a501de2edf6c2bd81333fa8af1f1303186b27ed (diff)
downloadmariadb-git-10.6-MDEV-16437.tar.gz
MDEV-16437: merge 5.7 P_S replication instrumentation and tables10.6-MDEV-16437
Merge 'replication_applier_status_by_coordinator' table. This table captures SQL_THREAD status in case of both single threaded and multi threaded slave configuration. When multi_source replication is enabled this table will display each source specific SQL_THREAD status. Replaced following columns: - CHANNEL_NAME with CONNECTION_NAME Added new columns for: - LAST_SEEN_TRANSACTION - LAST_TRANS_RETRY_COUNT
Diffstat (limited to 'mysql-test/suite/multi_source')
-rw-r--r--mysql-test/suite/multi_source/multisource.result7
-rw-r--r--mysql-test/suite/multi_source/simple.result7
-rw-r--r--mysql-test/suite/multi_source/simple.test6
3 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result
index 928c9799854..88753ccc8ae 100644
--- a/mysql-test/suite/multi_source/multisource.result
+++ b/mysql-test/suite/multi_source/multisource.result
@@ -179,6 +179,13 @@ Last_SQL_Errno = '0'
Slave_heartbeat_period = '60.000'
Slave_heartbeat_period = '60.000'
#
+#
+# MDEV:16437: merge 5.7 P_S replication instrumentation and tables
+#
+SELECT * FROM performance_schema.replication_applier_status_by_coordinator;
+CONNECTION_NAME THREAD_ID SERVICE_STATE LAST_SEEN_TRANSACTION LAST_ERROR_NUMBER LAST_ERROR_MESSAGE LAST_ERROR_TIMESTAMP LAST_TRANS_RETRY_COUNT
+master1 # ON 0-1-7 0 0000-00-00 00:00:00 0
+ # ON 0-2-4 0 0000-00-00 00:00:00 0
select * from db1.t1;
i f1
1 one
diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result
index bfb8e5de639..b57e146feb5 100644
--- a/mysql-test/suite/multi_source/simple.result
+++ b/mysql-test/suite/multi_source/simple.result
@@ -29,6 +29,13 @@ CONNECTION_NAME HOST PORT USER USING_GTID SSL_ALLOWED SSL_CA_FILE SSL_CA_PATH SS
slave2 # # root NO NO NO 60 86400 60.000
slave1 # # root NO NO NO 60 86400 60.000
start all slaves;
+#
+# MDEV:16437: merge 5.7 P_S replication instrumentation and tables
+#
+select * from performance_schema.replication_applier_status_by_coordinator;
+CONNECTION_NAME THREAD_ID SERVICE_STATE LAST_SEEN_TRANSACTION LAST_ERROR_NUMBER LAST_ERROR_MESSAGE LAST_ERROR_TIMESTAMP LAST_TRANS_RETRY_COUNT
+slave2 # ON 0 0000-00-00 00:00:00 0
+slave1 # ON 0 0000-00-00 00:00:00 0
stop slave 'slave1';
show slave 'slave1' status;
Slave_IO_State
diff --git a/mysql-test/suite/multi_source/simple.test b/mysql-test/suite/multi_source/simple.test
index 8c25f8be917..2ef6f451cf6 100644
--- a/mysql-test/suite/multi_source/simple.test
+++ b/mysql-test/suite/multi_source/simple.test
@@ -57,6 +57,12 @@ select * from performance_schema.replication_connection_configuration;
# Ensure that start all slaves doesn't do anything as all slaves are started
start all slaves;
+--echo #
+--echo # MDEV:16437: merge 5.7 P_S replication instrumentation and tables
+--echo #
+--replace_column 2 #
+select * from performance_schema.replication_applier_status_by_coordinator;
+
stop slave 'slave1';
--replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2 $read_master_log_pos <read_master_log_pos> $relay_log_pos <relay_log_pos> $relay_log_space1 <relay_log_space1> $relay_log_space2 <relay_log_space2>