Update --set-vars and ->prop() in all tools.

bin/pt-archiver

@@ -5335,7 +5335,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    # Frequently used options.
    $src             = $o->get('source');
@@ -7094,12 +7094,22 @@ L<"--stop">.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
 
-Specify any variables you want to be set immediately after connecting to MySQL.
+By default, the tool sets:
-These will be included in a C<SET> command.
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the default
+value of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --share-lock
 

bin/pt-config-diff

@@ -4984,7 +4984,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( !$o->get('help') ) {
       if ( @ARGV < 1 ) {
@@ -5325,10 +5325,21 @@ report width so values are not truncated beyond readability.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-deadlock-logger

@@ -4254,7 +4254,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    my $src;
    if ( my $src_dsn_string = shift @ARGV ) {
@@ -5116,10 +5116,21 @@ no L<"--interval"> is specified, a default 1 second interval will be used.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-duplicate-key-checker

@@ -4662,7 +4662,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    $o->usage_or_errors();
 
@@ -5144,10 +5144,21 @@ Port number to use for connection.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-find

@@ -3719,7 +3719,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    # Make sure OptionParser understands that these options are used.
    # cmin ctime empty kmin ktime mmin mtime exec printf 
@@ -4263,10 +4263,21 @@ Quoting happens after tests are run, and before actions are run.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-fk-error-logger

@@ -3721,7 +3721,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    my $src;
    if ( my $src_dsn_string = shift @ARGV ) {
@@ -4127,10 +4127,21 @@ How long to run before exiting.  By default, the tool runs forever.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-heartbeat

@@ -4641,7 +4641,7 @@ sub main {
 
    my $dp = $o->DSNParser;
    $dp->prop('dbidriver', $o->get('dbi-driver'));
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( !$o->get('help') ) {
       my @frames = $o->get('frames') =~ m/(\d+[smhd])/g;
@@ -5737,10 +5737,21 @@ Exit if this file exists.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --skew
 

bin/pt-index-usage

@@ -6112,7 +6112,7 @@ sub main {
    $o->get_specs();
    $o->get_opts();
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
    $o->set('progress', undef) if $o->get('q');
 
    if ( !$o->got('help') ) {
@@ -7159,10 +7159,21 @@ is no alternative)?  MAGIC_view_required_indexes:
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-kill

@@ -6371,7 +6371,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( !$o->got('busy-time') ) {
       $o->set('interval', 30) unless $o->got('interval');
@@ -7383,10 +7383,21 @@ jobs gracefully if necessary.  See also L<"--stop">.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-query-advisor

@@ -8078,7 +8078,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    my $review_dsn = $o->get('review');
    my $groupby    = lc $o->get('group-by');
@@ -9150,10 +9150,21 @@ How many samples of the query to show.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --[no]show-create-table
 

bin/pt-query-digest

@@ -12394,7 +12394,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    # Frequently used options.
    my $review_dsn = $o->get('review'); 
@@ -15408,10 +15408,21 @@ See also L<"--ignore-attributes"> and L<"ATTRIBUTES">.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --shorten
 

bin/pt-show-grants

@@ -1654,7 +1654,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    $o->usage_or_errors();
 
@@ -2119,10 +2119,21 @@ instead of once at the end of all the output.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-slave-delay

@@ -3981,7 +3981,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    my $dsn_defaults = $dp->parse_options($o);
    my $slave_dsn  = @ARGV ? $dp->parse(shift @ARGV, $dsn_defaults)
@@ -4505,10 +4505,21 @@ forever.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-slave-find

@@ -3584,7 +3584,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( $o->get('ask-pass') ) {
       $o->set('password', OptionParser::prompt_noecho("Enter password: "));
@@ -4047,10 +4047,21 @@ about each slave, like:
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-slave-restart

@@ -4636,7 +4636,7 @@ sub main {
    $o->get_opts();
 
    $dp = $o->DSNParser(); 
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    $o->set('verbose', 0) if $o->get('quiet');
 
@@ -5386,10 +5386,21 @@ Exit if this file exists.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --skip-count
 

bin/pt-table-checksum

@@ -8613,7 +8613,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    # Add the --replicate table to --ignore-tables.
    my %ignore_tables = (
@@ -11824,10 +11824,21 @@ the values of columns when checksumming.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000; group: Connection
+type: Array; group: Connection
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-table-sync

@@ -9476,7 +9476,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( $o->get('replicate') || $o->get('sync-to-master') ) {
       $o->set('wait', 60) unless $o->got('wait');
@@ -12137,10 +12137,21 @@ sync that table on servers C and D.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-table-usage

@@ -6398,7 +6398,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    $o->usage_or_errors();
 
@@ -7245,10 +7245,21 @@ interrupt with CTRL-C).
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-upgrade

@@ -12296,7 +12296,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    if ( !$o->get('help') ) {
       if ( @ARGV < 1 ) {
@@ -13522,10 +13522,21 @@ interrupt with CTRL-C).
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --shorten
 

bin/pt-variable-advisor

@@ -4885,7 +4885,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    my $vars_from         = $o->get('source-of-variables');
    # my $status_from       = lc $o->get('source-of-status');
@@ -5766,10 +5766,21 @@ Port number to use for connection.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this string
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket
 

bin/pt-visual-explain

@@ -2329,7 +2329,7 @@ sub main {
    $o->get_opts();
 
    my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->get('set-vars'));
+   $dp->prop('set-vars', $o->set_vars());
 
    $o->usage_or_errors();
 
@@ -2966,10 +2966,21 @@ Port number to use for connection.
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000
+type: Array
 
-Set these MySQL variables.  Immediately after connecting to MySQL, this
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-string will be appended to SET and executed.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
 
 =item --socket