Merge lp:~percona-toolkit-dev/percona-toolkit/opt-parsing-exit-status-bug-1039074 into lp:percona-toolkit/2.1

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

But see also https://bugs.launchpad.net/percona-toolkit/+bug/1069951

review: Approve

=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2012-10-20 23:59:28 +0000
+++ bin/pt-archiver	2012-10-22 18:26:45 +0000
@@ -524,7 +524,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -779,7 +779,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2012-10-20 23:59:28 +0000
+++ bin/pt-config-diff	2012-10-22 18:26:45 +0000
@@ -523,7 +523,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -778,7 +778,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2012-10-20 23:59:28 +0000
+++ bin/pt-deadlock-logger	2012-10-22 18:26:45 +0000
@@ -521,7 +521,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -776,7 +776,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2012-10-20 23:59:28 +0000
+++ bin/pt-diskstats	2012-10-22 18:26:45 +0000
@@ -523,7 +523,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -778,7 +778,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2012-10-20 23:59:28 +0000
+++ bin/pt-duplicate-key-checker	2012-10-22 18:26:45 +0000
@@ -1425,7 +1425,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1680,7 +1680,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-fifo-split'
--- bin/pt-fifo-split	2012-10-08 21:02:17 +0000
+++ bin/pt-fifo-split	2012-10-22 18:26:45 +0000
@@ -495,7 +495,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -750,7 +750,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-find'
--- bin/pt-find	2012-10-20 23:59:28 +0000
+++ bin/pt-find	2012-10-22 18:26:45 +0000
@@ -893,7 +893,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1148,7 +1148,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-fingerprint'
--- bin/pt-fingerprint	2012-10-08 21:02:17 +0000
+++ bin/pt-fingerprint	2012-10-22 18:26:45 +0000
@@ -496,7 +496,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -751,7 +751,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger	2012-10-20 23:59:28 +0000
+++ bin/pt-fk-error-logger	2012-10-22 18:26:45 +0000
@@ -520,7 +520,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -775,7 +775,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2012-10-20 23:59:28 +0000
+++ bin/pt-heartbeat	2012-10-22 18:26:45 +0000
@@ -1256,7 +1256,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1511,7 +1511,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2012-10-20 23:59:28 +0000
+++ bin/pt-index-usage	2012-10-22 18:26:45 +0000
@@ -1023,7 +1023,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1278,7 +1278,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-kill'
--- bin/pt-kill	2012-10-20 23:59:28 +0000
+++ bin/pt-kill	2012-10-22 18:26:45 +0000
@@ -528,7 +528,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -783,7 +783,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-log-player'
--- bin/pt-log-player	2012-10-08 21:02:17 +0000
+++ bin/pt-log-player	2012-10-22 18:26:45 +0000
@@ -500,7 +500,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -755,7 +755,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2012-10-22 17:34:52 +0000
+++ bin/pt-online-schema-change	2012-10-22 18:26:45 +0000
@@ -534,7 +534,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -789,7 +789,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-query-advisor'
--- bin/pt-query-advisor	2012-10-20 23:59:28 +0000
+++ bin/pt-query-advisor	2012-10-22 18:26:45 +0000
@@ -904,7 +904,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1159,7 +1159,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2012-10-20 23:59:28 +0000
+++ bin/pt-query-digest	2012-10-22 18:26:45 +0000
@@ -1042,7 +1042,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1297,7 +1297,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-show-grants'
--- bin/pt-show-grants	2012-10-08 21:02:17 +0000
+++ bin/pt-show-grants	2012-10-22 18:26:45 +0000
@@ -496,7 +496,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -751,7 +751,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-slave-delay'
--- bin/pt-slave-delay	2012-10-20 23:59:28 +0000
+++ bin/pt-slave-delay	2012-10-22 18:26:45 +0000
@@ -521,7 +521,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -776,7 +776,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-slave-find'
--- bin/pt-slave-find	2012-10-08 21:02:17 +0000
+++ bin/pt-slave-find	2012-10-22 18:26:45 +0000
@@ -500,7 +500,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -755,7 +755,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-slave-restart'
--- bin/pt-slave-restart	2012-10-20 23:59:28 +0000
+++ bin/pt-slave-restart	2012-10-22 18:26:45 +0000
@@ -642,7 +642,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -897,7 +897,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2012-10-20 23:59:28 +0000
+++ bin/pt-table-checksum	2012-10-22 18:26:45 +0000
@@ -2190,7 +2190,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -2445,7 +2445,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-table-sync'
--- bin/pt-table-sync	2012-10-20 23:59:28 +0000
+++ bin/pt-table-sync	2012-10-22 18:26:45 +0000
@@ -537,7 +537,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -792,7 +792,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-table-usage'
--- bin/pt-table-usage	2012-10-19 23:14:07 +0000
+++ bin/pt-table-usage	2012-10-22 18:26:45 +0000
@@ -445,6 +445,7 @@
       'default'    => 1,
       'cumulative' => 1,
       'negatable'  => 1,
+      'value_is_optional' => 1,
    );
 
    my $self = {
@@ -686,9 +687,10 @@
             $opt->{short} = undef;
          }
 
-         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
-         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
-         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
+         $opt->{is_negatable}   = $opt->{spec} =~ m/!/        ? 1 : 0;
+         $opt->{is_cumulative}  = $opt->{spec} =~ m/\+/       ? 1 : 0;
+         $opt->{optional_value} = $opt->{spec} =~ m/:/        ? 1 : 0;
+         $opt->{is_required}    = $opt->{desc} =~ m/required/ ? 1 : 0;
 
          $opt->{group} ||= 'default';
          $self->{groups}->{ $opt->{group} }->{$long} = 1;
@@ -824,7 +826,7 @@
    if ( $opt->{is_cumulative} ) {
       $opt->{value}++;
    }
-   else {
+   elsif ( !($opt->{optional_value} && !$val) ) {
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
@@ -881,7 +883,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1136,7 +1138,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
@@ -1365,11 +1367,12 @@
 sub _parse_attribs {
    my ( $self, $option, $attribs ) = @_;
    my $types = $self->{types};
+   my $eq    = $attribs->{'value_is_optional'} ? ':' : '=';
    return $option
       . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
       . ($attribs->{'negatable'}  ? '!'                              : '' )
       . ($attribs->{'cumulative'} ? '+'                              : '' )
-      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
+      . ($attribs->{'type'}       ? $eq . $types->{$attribs->{type}} : '' );
 }
 
 sub _parse_synopsis {
 
=== modified file 'bin/pt-tcp-model'
--- bin/pt-tcp-model	2012-10-08 21:02:17 +0000
+++ bin/pt-tcp-model	2012-10-22 18:26:45 +0000
@@ -499,7 +499,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -754,7 +754,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-trend'
--- bin/pt-trend	2012-10-12 17:09:46 +0000
+++ bin/pt-trend	2012-10-22 18:26:45 +0000
@@ -499,7 +499,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -754,7 +754,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade	2012-10-20 23:59:28 +0000
+++ bin/pt-upgrade	2012-10-22 18:26:45 +0000
@@ -1444,7 +1444,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1699,7 +1699,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-variable-advisor'
--- bin/pt-variable-advisor	2012-10-20 23:59:28 +0000
+++ bin/pt-variable-advisor	2012-10-22 18:26:45 +0000
@@ -525,7 +525,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -780,7 +780,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 'bin/pt-visual-explain'
--- bin/pt-visual-explain	2012-10-12 17:09:46 +0000
+++ bin/pt-visual-explain	2012-10-22 18:26:45 +0000
@@ -6,7 +6,20 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+# This tool is "fat-packed": most of its dependent modules are embedded
+# in this file.  Setting %INC to this file for each module makes Perl aware
+# of this so it will not try to load the module from @INC.  See the tool's
+# documentation for a full list of dependencies.
+BEGIN {
+   $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
+      ExplainParser
+      ExplainTree
+      OptionParser
+      DSNParser
+      Daemon
+   ));
+}
 
 # ###########################################################################
 # Converts text (e.g. saved output) to a "recordset" -- an array of hashrefs
@@ -719,6 +732,7 @@
       'default'    => 1,
       'cumulative' => 1,
       'negatable'  => 1,
+      'value_is_optional' => 1,
    );
 
    my $self = {
@@ -960,9 +974,10 @@
             $opt->{short} = undef;
          }
 
-         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
-         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
-         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
+         $opt->{is_negatable}   = $opt->{spec} =~ m/!/        ? 1 : 0;
+         $opt->{is_cumulative}  = $opt->{spec} =~ m/\+/       ? 1 : 0;
+         $opt->{optional_value} = $opt->{spec} =~ m/:/        ? 1 : 0;
+         $opt->{is_required}    = $opt->{desc} =~ m/required/ ? 1 : 0;
 
          $opt->{group} ||= 'default';
          $self->{groups}->{ $opt->{group} }->{$long} = 1;
@@ -1098,7 +1113,7 @@
    if ( $opt->{is_cumulative} ) {
       $opt->{value}++;
    }
-   else {
+   elsif ( !($opt->{optional_value} && !$val) ) {
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
@@ -1155,7 +1170,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -1410,7 +1425,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
@@ -1639,11 +1654,12 @@
 sub _parse_attribs {
    my ( $self, $option, $attribs ) = @_;
    my $types = $self->{types};
+   my $eq    = $attribs->{'value_is_optional'} ? ':' : '=';
    return $option
       . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
       . ($attribs->{'negatable'}  ? '!'                              : '' )
       . ($attribs->{'cumulative'} ? '+'                              : '' )
-      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
+      . ($attribs->{'type'}       ? $eq . $types->{$attribs->{type}} : '' );
 }
 
 sub _parse_synopsis {
 
=== modified file 'lib/OptionParser.pm'
--- lib/OptionParser.pm	2012-09-13 13:39:04 +0000
+++ lib/OptionParser.pm	2012-10-22 18:26:45 +0000
@@ -669,7 +669,7 @@
       else {
          print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
       }
-      exit 0;
+      exit 1;
    }
 
    if ( @ARGV && $self->{strict} ) {
@@ -988,7 +988,7 @@
    }
    elsif ( scalar @{$self->{errors}} ) {
       print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 0 unless $return;
+      exit 1 unless $return;
    }
 
    return;
 
=== modified file 't/lib/OptionParser.t'
--- t/lib/OptionParser.t	2012-09-13 13:39:04 +0000
+++ t/lib/OptionParser.t	2012-10-22 18:26:45 +0000
@@ -2058,6 +2058,28 @@
 );
 
 # #############################################################################
+# Bug 1039074: Tools exit 0 on error parsing options, should exit non-zero
+# #############################################################################
+
+# pt-archiver requires at least one of --dest, --file or --purge, as well as
+# --where and --source.  So specifying no options should cause errors.
+@ARGV = qw();
+$o = new OptionParser(file => "$trunk/bin/pt-archiver");
+$o->get_specs();
+$o->get_opts();
+
+my $exit_status = 0;
+($output, $exit_status) = full_output(
+   sub { $o->usage_or_errors("$trunk/bin/pt-archiver"); },
+);
+
+is(
+   $exit_status,
+   1,
+   "Non-zero exit status on error parsing options (bug 1039074)"
+);
+
+# #############################################################################
 # Done.
 # #############################################################################
 {
 
=== modified file 't/pt-deadlock-logger/option_sanity.t'
--- t/pt-deadlock-logger/option_sanity.t	2011-07-12 22:56:55 +0000
+++ t/pt-deadlock-logger/option_sanity.t	2012-10-22 18:26:45 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use PerconaTest;
 
@@ -40,6 +40,19 @@
 );
 
 # #############################################################################
+# Bug 1039074: Tools exit 0 on error parsing options, should exit non-zero
+# #############################################################################
+
+system("$trunk/bin/pt-deadlock-logger --i-am-the-error >/dev/null 2>&1");
+my $exit_status = $CHILD_ERROR >> 8;
+
+is(
+   $exit_status,
+   1,
+   "Non-zero exit on option error (bug 1039074)"
+);
+
+# #############################################################################
 # Done.
 # #############################################################################
 exit;