Merge lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-handles-mysql-user-password-in-awkward-way-1348679 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.11

[Frank Cizmich]

Added --ask-pass for -pt-stalk , so passwords don't have to be submitted in clear text.

Also fixed a small unrelated issue in Sandbox.pm were an error was output when no database named mysql was present.

[Daniel Nichter (daniel-nichter)]

review: Needs Fixing

[Daniel Nichter (daniel-nichter)]

But otherwise the code changes are good. Since this is real difficult to test, please test it manually.

[lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-handles-mysql-user-password-in-awkward-way-1348679]

619. By Frank Cizmich on 2014-09-15

Changed password prompt message. Changed --ask-pass doc description

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2014-08-05 20:37:42 +0000
+++ bin/pt-stalk	2014-09-15 20:43:51 +0000
@@ -1447,9 +1447,19 @@
       exit 0
    fi
 
+   # if ASK-PASS , request password on terminal without echoing. This will override --password
+   if [ -n "$OPT_ASK_PASS" ]; then 
+      stty_orig=`stty -g`           # save original terminal setting.
+      echo -n "Enter MySQL password: ";
+      stty -echo                    # turn-off echoing.
+      read OPT_PASSWORD             # read the password
+      stty $stty_orig               # restore terminal setting.
+   fi
+
    MYSQL_ARGS="$(mysql_options)"
    EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")"
 
+
    # Check that mysql and mysqladmin are in PATH.  If not, we're
    # already dead in the water, so don't bother with cmd line opts,
    # just error and exit.
@@ -1650,6 +1660,10 @@
 
 =over
 
+=item --ask-pass
+
+Prompt for a password when connecting to MySQL.
+
 =item --collect
 
 default: yes; negatable: yes

=== modified file 'lib/Sandbox.pm'
--- lib/Sandbox.pm	2014-05-28 20:31:10 +0000
+++ lib/Sandbox.pm	2014-09-15 20:43:51 +0000
@@ -374,6 +374,10 @@
            . join(", ", map { "mysql.$_" } @tables_in_mysql)
            . ", "
            . join(", ", map { "sakila.$_" } @tables_in_sakila);
+
+   # remove leading "," if any
+   $sql =~ s/CHECKSUM TABLES\s+,/CHECKSUM TABLES /;
+
    my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })};
 
    # Diff the two sets of checksums: host to master (ref).