From feb15958dbc62d770c40d8bbf0d2a1ac9c09a86b Mon Sep 17 00:00:00 2001 From: Marcelo Altmann Date: Fri, 5 Jan 2018 17:34:32 -0500 Subject: [PATCH 1/2] fixed missing fully qualified database name on slave_status PT-241 --- bin/pt-stalk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/pt-stalk b/bin/pt-stalk index 82a64df6..4aca86e5 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -1164,11 +1164,11 @@ slave_status() { echo -e "\n$sql\n" >> $outfile $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile - sql="SELECT * FROM replication_connection_status\G" + sql="SELECT * FROM performance_schema.replication_connection_status\G" echo -e "\n$sql\n" >> $outfile $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile - sql="SELECT * FROM replication_applier_status JOIN replication_applier_status_by_coordinator USING(channel_name)\G" + sql="SELECT * FROM performance_schema.replication_applier_status JOIN performance_schema.replication_applier_status_by_coordinator USING(channel_name)\G" echo -e "\n$sql\n" >> $outfile $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile fi From df7744e4b1d5df63e9b45bd9c99457e61a2d5011 Mon Sep 17 00:00:00 2001 From: Marcelo Altmann Date: Fri, 5 Jan 2018 17:55:06 -0500 Subject: [PATCH 2/2] include SHOW SLAVE STATUS on 5.7 version PT-242 --- bin/pt-stalk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/pt-stalk b/bin/pt-stalk index 4aca86e5..3af40d89 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -1155,11 +1155,10 @@ slave_status() { local outfile=$1 local mysql_version=$2 - if [ "${mysql_version}" '<' "5.7" ]; then - local sql="SHOW SLAVE STATUS\G" - echo -e "\n$sql\n" >> $outfile - $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile - else + local sql="SHOW SLAVE STATUS\G" + echo -e "\n$sql\n" >> $outfile + $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile + if [ "${mysql_version}" '>' "5.6" ]; then local sql="SELECT * FROM performance_schema.replication_connection_configuration JOIN performance_schema.replication_applier_configuration USING(channel_name)\G" echo -e "\n$sql\n" >> $outfile $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile