From bcc6da2919a4418487e986ca9979ac98c75a80ef Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Tue, 25 Jun 2013 15:28:48 -0700 Subject: [PATCH 1/3] Failing test for --set-vars var=0. --- t/lib/OptionParser.t | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/t/lib/OptionParser.t b/t/lib/OptionParser.t index 2f7e7bf5..23242870 100644 --- a/t/lib/OptionParser.t +++ b/t/lib/OptionParser.t @@ -2021,6 +2021,48 @@ is( "Non-zero exit status on error parsing options (bug 1039074)" ); + +# ############################################################################# +# --set-vars/set_vars() +# ############################################################################# + +@ARGV = qw(); +$o = new OptionParser(file => "$trunk/bin/pt-archiver"); +$o->get_specs(); +$o->get_opts(); + +my $vars = $o->set_vars("$trunk/bin/pt-archiver"); +is_deeply( + $vars, + { + wait_timeout => { + default => 1, + val => '10000', + }, + }, + "set_vars(): 1 default from docs" +) or diag(Dumper($vars)); + +# Bug 1182856: Zero values causes "Invalid --set-vars value: var=0" +@ARGV = qw(--set-vars SQL_LOG_BIN=0); +$o->get_opts(); + +$vars = $o->set_vars("$trunk/bin/pt-archiver"); +is_deeply( + $vars, + { + wait_timeout => { + default => 1, + val => '10000', + }, + SQL_LOG_BIN => { + default => 0, + val => '0', + }, + }, + "set_vars(): var=0 (bug 1182856)" +) or diag(Dumper($vars)); + # ############################################################################# # Done. # ############################################################################# From 591a49557cb8413d72d25d6c1c558d299d4718a0 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Tue, 25 Jun 2013 15:31:39 -0700 Subject: [PATCH 2/3] Fix OptionParser: check that val is defined, not true. --- lib/OptionParser.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/OptionParser.pm b/lib/OptionParser.pm index 346c4eb2..0b600fb5 100644 --- a/lib/OptionParser.pm +++ b/lib/OptionParser.pm @@ -1289,7 +1289,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1303,7 +1303,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, From 0ec803417d2c7c7ba8c261f7fdeeed297819afd0 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Tue, 25 Jun 2013 15:32:19 -0700 Subject: [PATCH 3/3] Update OptionParser in all tools. --- bin/pt-agent | 4 ++-- bin/pt-align | 4 ++-- bin/pt-archiver | 4 ++-- bin/pt-config-diff | 4 ++-- bin/pt-deadlock-logger | 4 ++-- bin/pt-diskstats | 4 ++-- bin/pt-duplicate-key-checker | 4 ++-- bin/pt-fifo-split | 4 ++-- bin/pt-find | 4 ++-- bin/pt-fingerprint | 4 ++-- bin/pt-fk-error-logger | 4 ++-- bin/pt-heartbeat | 4 ++-- bin/pt-index-usage | 4 ++-- bin/pt-kill | 4 ++-- bin/pt-online-schema-change | 4 ++-- bin/pt-query-digest | 4 ++-- bin/pt-show-grants | 4 ++-- bin/pt-slave-delay | 4 ++-- bin/pt-slave-find | 4 ++-- bin/pt-slave-restart | 4 ++-- bin/pt-table-checksum | 4 ++-- bin/pt-table-sync | 4 ++-- bin/pt-table-usage | 4 ++-- bin/pt-upgrade | 4 ++-- bin/pt-variable-advisor | 4 ++-- bin/pt-visual-explain | 4 ++-- 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/bin/pt-agent b/bin/pt-agent index 7eb73df2..08f38977 100755 --- a/bin/pt-agent +++ b/bin/pt-agent @@ -3560,7 +3560,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -3574,7 +3574,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-align b/bin/pt-align index 8908e84b..2bd4fbca 100755 --- a/bin/pt-align +++ b/bin/pt-align @@ -1028,7 +1028,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1042,7 +1042,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-archiver b/bin/pt-archiver index e369abf5..3f675ab9 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -1755,7 +1755,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1769,7 +1769,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-config-diff b/bin/pt-config-diff index 04e77b92..ea51421a 100755 --- a/bin/pt-config-diff +++ b/bin/pt-config-diff @@ -1755,7 +1755,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1769,7 +1769,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger index 5a5dd561..2e585341 100755 --- a/bin/pt-deadlock-logger +++ b/bin/pt-deadlock-logger @@ -1105,7 +1105,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1119,7 +1119,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-diskstats b/bin/pt-diskstats index af57c855..d971b427 100755 --- a/bin/pt-diskstats +++ b/bin/pt-diskstats @@ -1101,7 +1101,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1115,7 +1115,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker index dac4c687..a51f6910 100755 --- a/bin/pt-duplicate-key-checker +++ b/bin/pt-duplicate-key-checker @@ -2087,7 +2087,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -2101,7 +2101,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-fifo-split b/bin/pt-fifo-split index 2aa10358..3b6fb6b7 100755 --- a/bin/pt-fifo-split +++ b/bin/pt-fifo-split @@ -1029,7 +1029,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1043,7 +1043,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-find b/bin/pt-find index 14c7f21d..ae6cd0e3 100755 --- a/bin/pt-find +++ b/bin/pt-find @@ -1521,7 +1521,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1535,7 +1535,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-fingerprint b/bin/pt-fingerprint index 9fb82d0c..ca3f22c3 100755 --- a/bin/pt-fingerprint +++ b/bin/pt-fingerprint @@ -1030,7 +1030,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1044,7 +1044,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger index db204cf9..d9b01c78 100755 --- a/bin/pt-fk-error-logger +++ b/bin/pt-fk-error-logger @@ -1100,7 +1100,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1114,7 +1114,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat index 853e6051..401c3cd9 100755 --- a/bin/pt-heartbeat +++ b/bin/pt-heartbeat @@ -1837,7 +1837,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1851,7 +1851,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-index-usage b/bin/pt-index-usage index 4db53433..c3f2d98d 100755 --- a/bin/pt-index-usage +++ b/bin/pt-index-usage @@ -1682,7 +1682,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1696,7 +1696,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-kill b/bin/pt-kill index 51b956f4..27f9eefd 100755 --- a/bin/pt-kill +++ b/bin/pt-kill @@ -1110,7 +1110,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1124,7 +1124,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index a163332b..f10558e7 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -1117,7 +1117,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1131,7 +1131,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-query-digest b/bin/pt-query-digest index ed5b3c30..5e1200c4 100755 --- a/bin/pt-query-digest +++ b/bin/pt-query-digest @@ -2350,7 +2350,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -2364,7 +2364,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-show-grants b/bin/pt-show-grants index fff6fc1f..11f00745 100755 --- a/bin/pt-show-grants +++ b/bin/pt-show-grants @@ -1030,7 +1030,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1044,7 +1044,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay index f21bd454..5373b01a 100755 --- a/bin/pt-slave-delay +++ b/bin/pt-slave-delay @@ -1103,7 +1103,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1117,7 +1117,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-slave-find b/bin/pt-slave-find index bd58efe5..749ac619 100755 --- a/bin/pt-slave-find +++ b/bin/pt-slave-find @@ -1038,7 +1038,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1052,7 +1052,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart index 7a803ea6..4e4b8b04 100755 --- a/bin/pt-slave-restart +++ b/bin/pt-slave-restart @@ -1255,7 +1255,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1269,7 +1269,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum index 80690877..10aafd5a 100755 --- a/bin/pt-table-checksum +++ b/bin/pt-table-checksum @@ -2784,7 +2784,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -2798,7 +2798,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-table-sync b/bin/pt-table-sync index 519445fa..dfc91a91 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -1118,7 +1118,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1132,7 +1132,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-table-usage b/bin/pt-table-usage index 0a02a8da..c69b3b77 100755 --- a/bin/pt-table-usage +++ b/bin/pt-table-usage @@ -1467,7 +1467,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1481,7 +1481,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-upgrade b/bin/pt-upgrade index 0f1c3d08..a62793a4 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -2347,7 +2347,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -2361,7 +2361,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor index 4f9cdccd..737290c1 100755 --- a/bin/pt-variable-advisor +++ b/bin/pt-variable-advisor @@ -1107,7 +1107,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1121,7 +1121,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1, diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain index 8098fb8c..3bda0e20 100755 --- a/bin/pt-visual-explain +++ b/bin/pt-visual-explain @@ -1704,7 +1704,7 @@ sub set_vars { if ( $user_vars ) { foreach my $var_val ( @$user_vars ) { my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $user_vars{$var} = { val => $val, default => 0, @@ -1718,7 +1718,7 @@ sub set_vars { %default_vars = map { my $var_val = $_; my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/; - die "Invalid --set-vars value: $var_val\n" unless $var && $val; + die "Invalid --set-vars value: $var_val\n" unless $var && defined $val; $var => { val => $val, default => 1,