diff --git a/Changelog b/Changelog index 29d13bb3..e2b0098e 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ v3.0.7 * Feature PT-633 : Added --mysql-only option to pt-stalk for RDS * Fixed bug PT-1256: pt-table-sync does not use the character set for the table it is synchronizing * Fixed bug PT-1455: pt-osc is stuck when the table that is being altered is filtered out in the slave + * Fixed bug PT-1485: pt-mysql-summary has broken Security section in versions bigger then 5.6 * Fixed bug PMM-1905: Explain fails if encounters negative "ntoreturn" v3.0.6 released 2017-12-20 diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary index 59e55716..e0f1cf1f 100755 --- a/bin/pt-mysql-summary +++ b/bin/pt-mysql-summary @@ -927,6 +927,9 @@ collect_mysql_processlist () { collect_mysql_users () { $CMD_MYSQL $EXT_ARGV -ss -e 'SELECT COUNT(*), SUM(user=""), SUM(password=""), SUM(password NOT LIKE "*%") FROM mysql.user' 2>/dev/null + if [ "$?" -ne 0 ]; then + $CMD_MYSQL $EXT_ARGV -ss -e 'SELECT COUNT(*), SUM(user=""), SUM(authentication_string=""), SUM(authentication_string NOT LIKE "*%") FROM mysql.user' 2>/dev/null + fi } collect_mysql_show_slave_hosts () { @@ -2195,7 +2198,7 @@ report_jemalloc_enabled() { local JEMALLOC_LOCATION='' for PID in $(pidof mysqld); do - grep -qc jemalloc /proc/${PID}/environ || ldd $(which mysqld) | grep -qc jemalloc + grep -qc jemalloc /proc/${PID}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc JEMALLOC_STATUS=$? if [ $JEMALLOC_STATUS = 1 ]; then echo "jemalloc is not enabled in MySQL config for process with ID ${PID}" diff --git a/t/pt-mysql-summary/pt-mysql-summary.t b/t/pt-mysql-summary/pt-mysql-summary.t index f5e0da2d..3ea61c8a 100644 --- a/t/pt-mysql-summary/pt-mysql-summary.t +++ b/t/pt-mysql-summary/pt-mysql-summary.t @@ -66,6 +66,11 @@ like( "InnoDB section present" ); +like( + $out, + qr/Users \| 2/, + "Security works" +); # --read-samples for my $i (2..7) {