PT-2109 - pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" (#696)

* PT-2109 - pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" - Fixed issues still visible with SQL mode ANSI_QUOTES - Added test cases for this mode * PT-2109 - pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" - Removed keyring plugin check in the beginning of the test, because reported error would show up even on servers that do not have keyring plugin installed. Same applies to wsrep_on check and Percona Server features checks. - Removed temporary dir setup, because not needed for this test.
2025-09-02 10:36:28 +00:00 · 2023-11-03 01:46:32 +03:00
parent 817673755f
commit 1407b5380b
4 changed files with 97 additions and 8 deletions
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -957,9 +957,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
+   $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 WHERE account_locked <> "Y" AND password_expired <> "Y" AND authentication_string <> ""' 2>/dev/null
+       $CMD_MYSQL $EXT_ARGV -ss -e "SELECT COUNT(*), SUM(user=''), SUM(authentication_string=''), SUM(authentication_string NOT LIKE '*%') FROM mysql.user WHERE account_locked <> 'Y' AND password_expired <> 'Y' AND authentication_string <> ''" 2>/dev/null
   fi
 }

@@ -989,7 +989,7 @@ collect_internal_vars () {
   local mysqld_executables="${1:-""}"

   local FNV_64=""
-   if $CMD_MYSQL $EXT_ARGV -e 'SELECT FNV_64("a")' >/dev/null 2>&1; then
+   if $CMD_MYSQL $EXT_ARGV -e "SELECT FNV_64('a')" >/dev/null 2>&1; then
      FNV_64="Enabled";
   else
      FNV_64="Unknown";
@@ -1035,7 +1035,7 @@ collect_internal_vars () {
 }

 collect_keyring_plugins() {
-    $CMD_MYSQL $EXT_ARGV --table -ss -e 'SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE "keyring%";'
+    $CMD_MYSQL $EXT_ARGV --table -ss -e "SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'keyring%';"
 }

 collect_encrypted_tables() {
--- a/lib/bash/collect_mysql_info.sh
+++ b/lib/bash/collect_mysql_info.sh
@@ -135,9 +135,9 @@ collect_mysql_processlist () {
 collect_mysql_users () {
 # The where clause has been added to skip listing MySQL 8+ roles as users.
 # ROLES are locked accounts, without passwords and expired.
-   $CMD_MYSQL $EXT_ARGV -ss -e 'SELECT COUNT(*), SUM(user=""), SUM(password=""), SUM(password NOT LIKE "*%") FROM mysql.user' 2>/dev/null
+   $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 WHERE account_locked <> "Y" AND password_expired <> "Y" AND authentication_string <> ""' 2>/dev/null
+       $CMD_MYSQL $EXT_ARGV -ss -e "SELECT COUNT(*), SUM(user=''), SUM(authentication_string=''), SUM(authentication_string NOT LIKE '*%') FROM mysql.user WHERE account_locked <> 'Y' AND password_expired <> 'Y' AND authentication_string <> ''" 2>/dev/null
   fi
 }

@@ -168,7 +168,7 @@ collect_internal_vars () {
   local mysqld_executables="${1:-""}"

   local FNV_64=""
-   if $CMD_MYSQL $EXT_ARGV -e 'SELECT FNV_64("a")' >/dev/null 2>&1; then
+   if $CMD_MYSQL $EXT_ARGV -e "SELECT FNV_64('a')" >/dev/null 2>&1; then
      FNV_64="Enabled";
   else
      FNV_64="Unknown";
@@ -215,7 +215,7 @@ collect_internal_vars () {
 }

 collect_keyring_plugins() {
-    $CMD_MYSQL $EXT_ARGV --table -ss -e 'SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE "keyring%";'
+    $CMD_MYSQL $EXT_ARGV --table -ss -e "SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME LIKE 'keyring%';"
 }

 collect_encrypted_tables() {
--- a/t/pt-mysql-summary/pt-2109.t
+++ b/t/pt-mysql-summary/pt-2109.t
@@ -0,0 +1,60 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use PerconaTest;
+use Sandbox;
+use DSNParser;
+require VersionParser;
+use Test::More;
+
+local $ENV{PTDEBUG} = "";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('master');
+my $has_keyring_plugin;
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master';
+}
+else {
+   plan tests => 3;
+}
+
+my $output;
+my $cnf = '/tmp/12345/my.sandbox.cnf';
+
+my ($orig_sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE});
+$dbh->do("SET GLOBAL SQL_MODE='ANSI_QUOTES'");
+
+my $cmd = "$trunk/bin/pt-mysql-summary --sleep 1 -- --defaults-file=$cnf";
+
+$output = `$cmd 2>&1`;
+
+unlike(
+   $output,
+   qr/Unknown column 'keyring%' in 'where clause'/s,
+   "pt-mysql-summary works fine with SQL Mode ANSI_QUOTES"
+);
+
+unlike(
+   $output,
+   qr/You have an error in your SQL syntax.*wsrep_on/s,
+   "pt-mysql-summary works fine with PXC and SQL Mode ANSI_QUOTES"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$dbh->do("SET GLOBAL SQL_MODE='${orig_sql_mode}'");
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
--- a/t/pt-mysql-summary/pt-mysql-summary_encryption.t
+++ b/t/pt-mysql-summary/pt-mysql-summary_encryption.t
@@ -97,6 +97,35 @@ like(
   "Security works"
 );

+#
+# SQL Mode ANSI_QUOTES
+#
+
+my ($orig_sql_mode) = $master_dbh->selectrow_array(q{SELECT @@SQL_MODE});
+$master_dbh->do("SET GLOBAL SQL_MODE='ANSI_QUOTES'");
+
+$out = `$env $trunk/bin/$tool --sleep 1 --databases mysql 2>/dev/null -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
+
+like(
+   $out,
+   qr/Database Tables Views SPs Trigs Funcs   FKs Partn\s+\Qmysql\E/,
+   "--databases works with SQL Mode ANSI_QUOTES"
+);
+
+like(
+   $out,
+   qr/# InnoDB #.*Version.*# MyISAM #/s,
+   "InnoDB section present with SQL Mode ANSI_QUOTES"
+);
+
+like(
+   $out,
+   qr/Users \| 2/,
+   "Security works with SQL Mode ANSI_QUOTES"
+);
+
+$master_dbh->do("SET GLOBAL SQL_MODE='${orig_sql_mode}'");
+
 # --read-samples
 for my $i (2..9) {
   ok(