From c554e9892616b87c1a768a3e4b178d576d5e1261 Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Wed, 29 Mar 2017 15:10:25 -0300
Subject: [PATCH] Revert "Merge pull request #197 from percona/PT-115"

This reverts commit 0f5ce4cc0bc782dcf6e3c2ba3af9223fb3ddd09d, reversing
changes made to 515833f3d26e6b6a5c0d6c5aa3f26f4783d2340a.
---
 bin/pt-align                 | 6 +-----
 bin/pt-archiver              | 6 +-----
 bin/pt-config-diff           | 6 +-----
 bin/pt-deadlock-logger       | 6 +-----
 bin/pt-diskstats             | 6 +-----
 bin/pt-duplicate-key-checker | 6 +-----
 bin/pt-fifo-split            | 6 +-----
 bin/pt-find                  | 6 +-----
 bin/pt-fingerprint           | 6 +-----
 bin/pt-fk-error-logger       | 6 +-----
 bin/pt-heartbeat             | 6 +-----
 bin/pt-index-usage           | 6 +-----
 bin/pt-kill                  | 6 +-----
 bin/pt-online-schema-change  | 6 +-----
 bin/pt-query-digest          | 6 +-----
 bin/pt-show-grants           | 6 +-----
 bin/pt-slave-delay           | 6 +-----
 bin/pt-slave-find            | 6 +-----
 bin/pt-slave-restart         | 6 +-----
 bin/pt-table-checksum        | 6 +-----
 bin/pt-table-sync            | 6 +-----
 bin/pt-table-usage           | 6 +-----
 bin/pt-upgrade               | 6 +-----
 bin/pt-variable-advisor      | 6 +-----
 bin/pt-visual-explain        | 6 +-----
 lib/OptionParser.pm          | 6 +-----
 26 files changed, 26 insertions(+), 130 deletions(-)

diff --git a/bin/pt-align b/bin/pt-align
index c3eb2907..26f9254e 100755
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -677,11 +677,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-archiver b/bin/pt-archiver
index 82bd4611..61780ba8 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -1406,11 +1406,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 29ba1273..f49388c4 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -1404,11 +1404,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 24cb94bf..8a78f501 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -754,11 +754,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 45cd6997..554b77b6 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -750,11 +750,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index d80251ea..556b56dd 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -1741,11 +1741,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-fifo-split b/bin/pt-fifo-split
index 7c6b12a9..64de52ab 100755
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -678,11 +678,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-find b/bin/pt-find
index 37993dc2..e9d5f056 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -1170,11 +1170,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-fingerprint b/bin/pt-fingerprint
index 336c78de..f994cf94 100755
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -679,11 +679,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 3adf955e..352c0b62 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -749,11 +749,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 5d52e392..b2418761 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -1515,11 +1515,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index bde4951f..b5970399 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -1331,11 +1331,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-kill b/bin/pt-kill
index 20684c6f..db4886c2 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -759,11 +759,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 79bba77c..38f54ad7 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -767,11 +767,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 057110d7..91956f5d 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -1999,11 +1999,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index ea3b43cf..ec4141db 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -680,11 +680,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index bc4d1ccd..6cecb5c7 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -752,11 +752,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index cd74a964..9ad4d2d3 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -687,11 +687,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 70faf358..9f4144cc 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -904,11 +904,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 1b8b1675..0b9ed191 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -2428,11 +2428,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index a26ca9cc..74d1d41a 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -767,11 +767,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-table-usage b/bin/pt-table-usage
index bb9d87f2..f70861ce 100755
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -1772,11 +1772,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 782ee3b5..eb05dc49 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -1996,11 +1996,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 90ccb4ce..33abf4c8 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -756,11 +756,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain
index ce72ce30..04194879 100755
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -1353,11 +1353,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
diff --git a/lib/OptionParser.pm b/lib/OptionParser.pm
index c323dd48..b1c2c699 100644
--- a/lib/OptionParser.pm
+++ b/lib/OptionParser.pm
@@ -838,11 +838,7 @@ sub _validate_type {
          }
       }
       my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
-      }
+      $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
       PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');