Merge lp:~percona-toolkit-dev/percona-toolkit/pt-ms-pt-stalk-standard-mysql-options into lp:percona-toolkit/2.2

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/pt-ms-pt-stalk-standard-mysql-options]

521. By Brian Fraser on 2013-03-05

Minor fixes for compat

[Brian Fraser (fraserbn)]

review: Approve

[Daniel Nichter (daniel-nichter)]

https://refute.testnoir.com/percona-toolkit/jobs/percona-toolkit-full-branch-test/19/results/errors

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/pt-ms-pt-stalk-standard-mysql-options]

522. By Brian Fraser on 2013-03-06

Rearrange mysql options so that --defaults-file is always first, and remove default: localhost from pt-ms and pt-stalk, since parse_options.sh deals with defaults + config files for mysql options poorly

523. By Brian Fraser on 2013-03-06

update-samples on pt-ms

524. By Brian Fraser on 2013-03-06

Removed test for hosts's default

[Daniel Nichter (daniel-nichter)]

Still failing tests: https://refute.testnoir.com/percona-toolkit/jobs/percona-toolkit-all-platforms/70/results/failures#275789796

review: Needs Fixing

[Daniel Nichter (daniel-nichter)]

Passes all: https://refute.testnoir.com/percona-toolkit/jobs/percona-toolkit-full-branch-test/24/results

review: Approve

[lp:~percona-toolkit-dev/percona-toolkit/pt-ms-pt-stalk-standard-mysql-options]

525. By Daniel Nichter on 2013-03-09

Alphabetize pt-mysql-summary and pt-stalk options.

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2013-03-09 16:57:54 +0000
+++ bin/pt-mysql-summary	2013-03-09 18:49:22 +0000
@@ -347,14 +347,14 @@
 
       if [ "$next_opt_is_val" ]; then
          next_opt_is_val=""
-         if [ $# -eq 0 ] || [ $(expr "$opt" : "-") -eq 1 ]; then
+         if [ $# -eq 0 ] || [ $(expr "$opt" : "\-") -eq 1 ]; then
             option_error "$real_opt requires a $required_arg argument"
             continue
          fi
          val="$opt"
          opt_is_ok=1
       else
-         if [ $(expr "$opt" : "-") -eq 0 ]; then
+         if [ $(expr "$opt" : "\-") -eq 0 ]; then
             if [ -z "$ARGV" ]; then
                ARGV="$opt"
             else
@@ -451,6 +451,61 @@
 # ###########################################################################
 
 # ###########################################################################
+# mysql_options package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/mysql_options.sh
+#   t/lib/bash/mysql_options.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+
+set -u
+
+mysql_options() {
+   local MYSQL_ARGS=""
+   if [ -n "$OPT_DEFAULTS_FILE" ]; then
+      MYSQL_ARGS="--defaults-file=$OPT_DEFAULTS_FILE"
+   fi
+   if [ -n "$OPT_PORT" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --port=$OPT_PORT"
+   fi
+   if [ -n "$OPT_SOCKET" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --socket=$OPT_SOCKET"
+   fi
+   if [ -n "$OPT_HOST" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --host=$OPT_HOST"
+   fi
+   if [ -n "$OPT_USER" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --user=$OPT_USER"
+   fi
+   if [ -n "$OPT_PASSWORD" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --password=$OPT_PASSWORD"
+   fi
+   
+   echo $MYSQL_ARGS
+}
+
+arrange_mysql_options() {
+   local opts="$1"
+   
+   local rearranged=""
+   for opt in $opts; do
+      if [ "$(echo $opt | awk -F= '{print $1}')" = "--defaults-file" ]; then
+          rearranged="$opt $rearranged"
+      else
+         rearranged="$rearranged $opt"
+      fi
+   done
+   
+   echo "$rearranged"
+}
+
+# ###########################################################################
+# End mysql_options package
+# ###########################################################################
+
+# ###########################################################################
 # tmpdir package
 # This package is a copy without comments from the original.  The original
 # with comments and its test file can be found in the Bazaar repository at,
@@ -788,7 +843,6 @@
          echo "internal::oom_of_$pid    $oom" >> "$variables_file"
       done
 
-      pids="$pids"
       pids="$(echo $pids | sed -e 's/ /,/g')"
       ps ww -p "$pids" 2>/dev/null
    else
@@ -930,8 +984,13 @@
 collect_mysqld_executables () {
    local mysqld_instances="$1"
 
+   local ps_opt="cmd="
+   if [ "$(uname -s)" = "Darwin" ]; then
+      ps_opt="command="
+   fi
+
    for pid in $( grep '/mysqld' "$mysqld_instances" | awk '/^.*[0-9]/{print $1}' ); do
-      ps -o cmd -p $pid | sed -e 's/^\(.*mysqld\) .*/\1/' | grep -v '^CMD$'
+      ps -o $ps_opt -p $pid | sed -e 's/^\(.*mysqld\) .*/\1/'
    done | sort -u
 }
 
@@ -2320,6 +2379,7 @@
 
    section "Configuration File"
    local cnf_file="$(get_var "pt-summary-internal-Config_File_path" "$dir/mysql-variables")"
+
    if [ -n "${cnf_file}" ]; then
       name_val "Config File" "${cnf_file}"
       pretty_print_cnf_file "$dir/mysql-config-file"
@@ -2376,6 +2436,14 @@
    # Prepending SIG to these doesn't work with NetBSD's sh
    trap sigtrap HUP INT TERM
 
+   local MYSQL_ARGS="$(mysql_options)"
+   EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")"
+
+   # Check if mysql and mysqldump are there, otherwise bail out early.
+   # But don't if they passed in --read-samples, since we don't need
+   # a connection then.
+   [ "$OPT_READ_SAMPLES" ] || check_mysql
+
    local RAN_WITH="--sleep=$OPT_SLEEP --databases=$OPT_DATABASES --save-samples=$OPT_SAVE_SAMPLES"
 
    _d "Starting $0 $RAN_WITH"
@@ -2442,11 +2510,6 @@
       exit 0
    fi
 
-   # Check if mysql and mysqldump are there, otherwise bail out early.
-   # But don't if they passed in --read-samples, since we don't need
-   # a connection then.
-   [ "$OPT_READ_SAMPLES" ] || check_mysql
-
    main "${@:-""}"
 fi
 
@@ -2462,7 +2525,7 @@
 
 =head1 SYNOPSIS
 
-Usage: pt-mysql-summary [OPTIONS] [-- MYSQL OPTIONS]
+Usage: pt-mysql-summary [OPTIONS]
 
 pt-mysql-summary conveniently summarizes the status and configuration of a
 MySQL database server so that you can learn about it at a glance.  It is not
@@ -2498,7 +2561,7 @@
 To use, simply execute it.  Optionally add a double dash and then the same
 command-line options you would use to connect to MySQL, such as the following:
 
-  pt-mysql-summary -- --user=root
+  pt-mysql-summary --user=root
 
 The tool interacts minimally with the server upon which it runs.  It assumes
 that you'll run it on the same server you're inspecting, and therefore it
@@ -2557,24 +2620,24 @@
 database and operating system times match.
 
   # Processlist ################################################
-  
+
     Command                        COUNT(*) Working SUM(Time) MAX(Time)
     ------------------------------ -------- ------- --------- ---------
     Binlog Dump                           1       1    150000    150000
     Query                                 1       1         0         0
-  
+
     User                           COUNT(*) Working SUM(Time) MAX(Time)
     ------------------------------ -------- ------- --------- ---------
     msandbox                              2       2    150000    150000
-  
+
     Host                           COUNT(*) Working SUM(Time) MAX(Time)
     ------------------------------ -------- ------- --------- ---------
     localhost                             2       2    150000    150000
-  
+
     db                             COUNT(*) Working SUM(Time) MAX(Time)
     ------------------------------ -------- ------- --------- ---------
     NULL                                  2       2    150000    150000
-  
+
     State                          COUNT(*) Working SUM(Time) MAX(Time)
     ------------------------------ -------- ------- --------- ---------
     Master has sent all binlog to         1       1    150000    150000
@@ -2667,22 +2730,22 @@
   Would you like to mysqldump -d the schema and analyze it? y/n y
   There are 4 databases.  Would you like to dump all, or just one?
   Type the name of the database, or press Enter to dump all of them. 
-  
+
     Database           Tables Views SPs Trigs Funcs   FKs Partn
     mysql                  24                                  
     performance_schema     17                                  
     sakila                 16     7   3     6     3    22      
-  
+
     Database           MyISAM CSV PERFORMANCE_SCHEMA InnoDB
     mysql                  22   2                          
     performance_schema                            17       
     sakila                  8                            15
-  
+
     Database           BTREE FULLTEXT
     mysql                 31         
     performance_schema               
     sakila                63        1
-  
+
                          c   t   s   e   l   d   i   t   m   v   s
                          h   i   e   n   o   a   n   i   e   a   m
                          a   m   t   u   n   t   t   n   d   r   a
@@ -2889,36 +2952,73 @@
 Read this comma-separated list of config files.  If specified, this must be the
 first option on the command line.
 
+=item --databases
+
+type: string
+
+Names of databases to summarize. If you want all of them, you can use the value
+C<--all-databases>; you can also pass in a comma-separated list of database
+names. If not provided, the program will ask you for manual input.
+
+=item --defaults-file
+
+short form: -F; type: string
+
+Only read mysql options from the given file.  You must give an absolute
+pathname.
+
 =item --help
 
 Print help and exit.
 
+=item --host
+
+short form: -h; type: string
+
+Host to connect to.
+
+=item --password
+
+short form: -p; type: string
+
+Password to use when connecting.
+
+=item --port
+
+short form: -P; type: int
+
+Port number to use for connection.
+
+=item --read-samples
+
+type: string
+
+Create a report from the files found in this directory.
+
 =item --save-samples
 
 type: string
 
 Save the data files used to generate the summary in this directory.
 
-=item --read-samples
-
-type: string
-
-Create a report from the files found in this directory.
-
-=item --databases
-
-type: string
-
-Names of databases to summarize. If you want all of them, you can use the value
-C<--all-databases>; you can also pass in a comma-separated list of database
-names. If not provided, the program will ask you for manual input.
-
 =item --sleep
 
 type: int; default: 10
 
 Seconds to sleep when gathering status counters.
 
+=item --socket
+
+short form: -S; type: string
+
+Socket file to use for connection.
+
+=item --user
+
+short form: -u; type: string
+
+User for login if not current user.
+
 =item --version
 
 Print tool's version and exit.

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2013-03-09 16:57:54 +0000
+++ bin/pt-stalk	2013-03-09 18:49:22 +0000
@@ -399,14 +399,14 @@
 
       if [ "$next_opt_is_val" ]; then
          next_opt_is_val=""
-         if [ $# -eq 0 ] || [ $(expr "$opt" : "-") -eq 1 ]; then
+         if [ $# -eq 0 ] || [ $(expr "$opt" : "\-") -eq 1 ]; then
             option_error "$real_opt requires a $required_arg argument"
             continue
          fi
          val="$opt"
          opt_is_ok=1
       else
-         if [ $(expr "$opt" : "-") -eq 0 ]; then
+         if [ $(expr "$opt" : "\-") -eq 0 ]; then
             if [ -z "$ARGV" ]; then
                ARGV="$opt"
             else
@@ -503,6 +503,61 @@
 # ###########################################################################
 
 # ###########################################################################
+# mysql_options package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/mysql_options.sh
+#   t/lib/bash/mysql_options.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+
+set -u
+
+mysql_options() {
+   local MYSQL_ARGS=""
+   if [ -n "$OPT_DEFAULTS_FILE" ]; then
+      MYSQL_ARGS="--defaults-file=$OPT_DEFAULTS_FILE"
+   fi
+   if [ -n "$OPT_PORT" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --port=$OPT_PORT"
+   fi
+   if [ -n "$OPT_SOCKET" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --socket=$OPT_SOCKET"
+   fi
+   if [ -n "$OPT_HOST" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --host=$OPT_HOST"
+   fi
+   if [ -n "$OPT_USER" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --user=$OPT_USER"
+   fi
+   if [ -n "$OPT_PASSWORD" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --password=$OPT_PASSWORD"
+   fi
+   
+   echo $MYSQL_ARGS
+}
+
+arrange_mysql_options() {
+   local opts="$1"
+   
+   local rearranged=""
+   for opt in $opts; do
+      if [ "$(echo $opt | awk -F= '{print $1}')" = "--defaults-file" ]; then
+          rearranged="$opt $rearranged"
+      else
+         rearranged="$rearranged $opt"
+      fi
+   done
+   
+   echo "$rearranged"
+}
+
+# ###########################################################################
+# End mysql_options package
+# ###########################################################################
+
+# ###########################################################################
 # tmpdir package
 # This package is a copy without comments from the original.  The original
 # with comments and its test file can be found in the Bazaar repository at,
@@ -1370,6 +1425,9 @@
       exit 0
    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.
@@ -1439,13 +1497,23 @@
 
 =head1 SYNOPSIS
 
-Usage: pt-stalk [OPTIONS] [-- MYSQL OPTIONS]
+Usage: pt-stalk [OPTIONS]
 
+<<<<<<< TREE
 pt-stalk waits for a trigger condition to occur, then collects data
 to help diagnose problems.  The tool is designed to run as a daemon with root
+=======
+pt-stalk watches for a trigger condition to become true, and then collects data
+to help in diagnosing problems.  It is designed to run as a daemon with root
+>>>>>>> MERGE-SOURCE
 privileges, so that you can diagnose intermittent problems that you cannot
+<<<<<<< TREE
 observe directly.  You can also use it to execute a custom command, or to
 collect data on demand without waiting for the trigger to occur.
+=======
+observe directly.  You can also use it to execute a custom command, or to gather
+the data on demand without waiting for the trigger to happen.
+>>>>>>> MERGE-SOURCE
 
 =head1 RISKS
 
@@ -1633,6 +1701,13 @@
 Daemonize the tool.  This causes the tool to fork into the background and log
 its output as specified in --log.
 
+=item --defaults-file
+
+short form: -F; type: string
+
+Only read mysql options from the given file.  You must give an absolute
+pathname.
+
 =item --dest
 
 type: string; default: /var/lib/pt-stalk
@@ -1730,6 +1805,12 @@
 
 Print help and exit.
 
+=item --host
+
+short form: -h; type: string
+
+Host to connect to.
+
 =item --interval
 
 type: int; default: 1
@@ -1765,6 +1846,12 @@
 
 Send an email to these addresses for every L<"--collect">.
 
+=item --password
+
+short form: -p; type: string
+
+Password to use when connecting.
+
 =item --pid
 
 type: string; default: /var/run/pt-stalk.pid
@@ -1839,6 +1926,12 @@
 to C<1>.  In this case, the global variable C<EXIT_REASON> should also
 be set to indicate why the tool was stopped.
 
+=item --port
+
+short form: -P; type: int
+
+Port number to use for connection.
+
 =item --prefix 
 
 type: string
@@ -1886,6 +1979,12 @@
 It also prevents filling up the disk or gathering too much data to analyze
 reasonably.
 
+=item --socket
+
+short form: -S; type: string
+
+Socket file to use for connection.
+
 =item --stalk
 
 default: yes; negatable: yes
@@ -1915,6 +2014,12 @@
 
 See also L<"--function">.
 
+=item --user
+
+short form: -u; type: string
+
+User for login if not current user.
+
 =item --variable
 
 type: string; default: Threads_running

=== modified file 'bin/pt-summary'
--- bin/pt-summary	2013-03-09 16:57:54 +0000
+++ bin/pt-summary	2013-03-09 18:49:22 +0000
@@ -354,14 +354,14 @@
 
       if [ "$next_opt_is_val" ]; then
          next_opt_is_val=""
-         if [ $# -eq 0 ] || [ $(expr "$opt" : "-") -eq 1 ]; then
+         if [ $# -eq 0 ] || [ $(expr "$opt" : "\-") -eq 1 ]; then
             option_error "$real_opt requires a $required_arg argument"
             continue
          fi
          val="$opt"
          opt_is_ok=1
       else
-         if [ $(expr "$opt" : "-") -eq 0 ]; then
+         if [ $(expr "$opt" : "\-") -eq 0 ]; then
             if [ -z "$ARGV" ]; then
                ARGV="$opt"
             else

=== modified file 'lib/bash/collect_mysql_info.sh'
--- lib/bash/collect_mysql_info.sh	2012-11-27 21:28:07 +0000
+++ lib/bash/collect_mysql_info.sh	2013-03-09 18:49:22 +0000
@@ -43,7 +43,6 @@
          echo "internal::oom_of_$pid    $oom" >> "$variables_file"
       done
 
-      pids="$pids"
       pids="$(echo $pids | sed -e 's/ /,/g')"
       ps ww -p "$pids" 2>/dev/null
    else
@@ -201,8 +200,13 @@
 collect_mysqld_executables () {
    local mysqld_instances="$1"
 
+   local ps_opt="cmd="
+   if [ "$(uname -s)" = "Darwin" ]; then
+      ps_opt="command="
+   fi
+
    for pid in $( grep '/mysqld' "$mysqld_instances" | awk '/^.*[0-9]/{print $1}' ); do
-      ps -o cmd -p $pid | sed -e 's/^\(.*mysqld\) .*/\1/' | grep -v '^CMD$'
+      ps -o $ps_opt -p $pid | sed -e 's/^\(.*mysqld\) .*/\1/'
    done | sort -u
 }
 

=== added file 'lib/bash/mysql_options.sh'
--- lib/bash/mysql_options.sh	1970-01-01 00:00:00 +0000
+++ lib/bash/mysql_options.sh	2013-03-09 18:49:22 +0000
@@ -0,0 +1,68 @@
+# This program is copyright 2011 Percona Inc.
+# Feedback and improvements are welcome.
+#
+# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
+# systems, you can issue `man perlgpl' or `man perlartistic' to read these
+# licenses.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA  02111-1307  USA.
+# ###########################################################################
+# mysql_options package
+# ###########################################################################
+
+# Package: mysql_options
+# Handle --defaults-file & related options
+
+set -u
+
+mysql_options() {
+   local MYSQL_ARGS=""
+   if [ -n "$OPT_DEFAULTS_FILE" ]; then
+      MYSQL_ARGS="--defaults-file=$OPT_DEFAULTS_FILE"
+   fi
+   if [ -n "$OPT_PORT" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --port=$OPT_PORT"
+   fi
+   if [ -n "$OPT_SOCKET" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --socket=$OPT_SOCKET"
+   fi
+   if [ -n "$OPT_HOST" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --host=$OPT_HOST"
+   fi
+   if [ -n "$OPT_USER" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --user=$OPT_USER"
+   fi
+   if [ -n "$OPT_PASSWORD" ]; then
+      MYSQL_ARGS="$MYSQL_ARGS --password=$OPT_PASSWORD"
+   fi
+   
+   echo $MYSQL_ARGS
+}
+
+# This basically makes sure that --defaults-file comes first
+arrange_mysql_options() {
+   local opts="$1"
+   
+   local rearranged=""
+   for opt in $opts; do
+      if [ "$(echo $opt | awk -F= '{print $1}')" = "--defaults-file" ]; then
+          rearranged="$opt $rearranged"
+      else
+         rearranged="$rearranged $opt"
+      fi
+   done
+   
+   echo "$rearranged"
+}
+
+# ###########################################################################
+# End mysql_options package
+# ###########################################################################

=== modified file 'lib/bash/parse_options.sh'
--- lib/bash/parse_options.sh	2012-11-27 21:05:53 +0000
+++ lib/bash/parse_options.sh	2013-03-09 18:49:22 +0000
@@ -398,7 +398,7 @@
 
       if [ "$next_opt_is_val" ]; then
          next_opt_is_val=""
-         if [ $# -eq 0 ] || [ $(expr "$opt" : "-") -eq 1 ]; then
+         if [ $# -eq 0 ] || [ $(expr "$opt" : "\-") -eq 1 ]; then
             option_error "$real_opt requires a $required_arg argument"
             continue
          fi
@@ -406,7 +406,7 @@
          opt_is_ok=1
       else
          # If option does not begin with a hyphen (-), it's a filename, etc.
-         if [ $(expr "$opt" : "-") -eq 0 ]; then
+         if [ $(expr "$opt" : "\-") -eq 0 ]; then
             if [ -z "$ARGV" ]; then
                ARGV="$opt"
             else

=== modified file 'lib/bash/report_mysql_info.sh'
--- lib/bash/report_mysql_info.sh	2012-12-06 00:10:22 +0000
+++ lib/bash/report_mysql_info.sh	2013-03-09 18:49:22 +0000
@@ -1489,6 +1489,7 @@
    # ########################################################################
    section "Configuration File"
    local cnf_file="$(get_var "pt-summary-internal-Config_File_path" "$dir/mysql-variables")"
+
    if [ -n "${cnf_file}" ]; then
       name_val "Config File" "${cnf_file}"
       pretty_print_cnf_file "$dir/mysql-config-file"

=== added file 't/lib/bash/mysql_options.sh'
--- t/lib/bash/mysql_options.sh	1970-01-01 00:00:00 +0000
+++ t/lib/bash/mysql_options.sh	2013-03-09 18:49:22 +0000
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+plan 3
+
+TMPFILE="$TEST_PT_TMPDIR/parse-opts-output"
+TOOL="pt-mysql-summary"
+PT_TMPDIR="$TEST_PT_TMPDIR"
+
+source "$LIB_DIR/log_warn_die.sh"
+source "$LIB_DIR/parse_options.sh"
+source "$LIB_DIR/mysql_options.sh"
+
+cnf="/tmp/12345/my.sandbox.cnf"
+
+parse_options "$PERCONA_TOOLKIT_BRANCH/bin/pt-mysql-summary" --defaults-file $cnf
+is "$OPT_DEFAULTS_FILE" "$cnf" "--defaults-file works"
+
+# ############################################################################
+# Short forms work
+# ############################################################################
+
+parse_options "$PERCONA_TOOLKIT_BRANCH/bin/pt-mysql-summary" -F $cnf
+is "$OPT_DEFAULTS_FILE" "$cnf" "-F works"
+
+parse_options "$PERCONA_TOOLKIT_BRANCH/bin/pt-mysql-summary" -u msandbox
+is "$OPT_USER" "msandbox" "-u works"
+
+# ############################################################################
+# Done
+# ############################################################################

=== added symlink 't/lib/bash/mysql_options.t'
=== target is u'../../../util/test-bash-functions'
=== modified file 't/pt-stalk/pt-stalk.t'
--- t/pt-stalk/pt-stalk.t	2013-03-04 22:57:52 +0000
+++ t/pt-stalk/pt-stalk.t	2013-03-09 18:49:22 +0000
@@ -144,7 +144,7 @@
 
 cleanup();
 
-$retval = system("$trunk/bin/pt-stalk --daemonize --pid $pid_file --log $log_file --dest $dest --verbose 3 -- --defaults-file=$cnf");
+$retval = system("$trunk/bin/pt-stalk --daemonize --pid $pid_file --log $log_file --variable Threads_running --dest $dest --verbose 3 -- --defaults-file=$cnf");
 
 PerconaTest::wait_for_files($pid_file, $log_file);
 PerconaTest::wait_for_sh("grep -q 'Check results' $log_file >/dev/null");
@@ -155,7 +155,7 @@
    $output,
    qr/Check results: Threads_running=\d+, matched=no, cycles_true=0/,
    "Matching results logged with --verbose 3"
-) or diag(`cat $log_file 2>/dev/null`, `cat $dest/*-output 2>/dev/null`);
+) or diag(`cat $dest/*-output 2>/dev/null`);
 
 # #############################################################################
 # --verbose 1 (just errors and warnings)