Merge lp:~percona-toolkit-dev/percona-toolkit/masterslave-redesign-prototype into lp:percona-toolkit/2.1

[Brian Fraser]

[lp:~percona-toolkit-dev/percona-toolkit/masterslave-redesign-prototype]

417. By Daniel Nichter on 2012-10-19

Merge fix-pt-upgrade-select-bug-1060774

418. By Daniel Nichter on 2012-10-19

Merge fix-938068-ptc-slave-binlog-formats

419. By Daniel Nichter on 2012-10-19

Merge fix-978133-remove-pqd-priv-checks

[Daniel Nichter (daniel-nichter)]

Typo: http://bazaar.launchpad.net/~percona-toolkit-dev/percona-toolkit/masterslave-redesign-prototype/revision/356#lib/TableSyncer.pm

Moving is_replication_thread to Processlist.pm is good.

What does Percona::Object do? It looks like if an obj has => 'foo_bar' and it also has OptionParser then it sets its foo_bar = $o->get('foo-bar')?

# Internal caches
has [qw( _not_a_master _not_a_slave _sths )] => (
^ Get rid of all caching. Well not *all* caching: stuff like server_ids_seen is required. What I mean is "global" caches, i.e. stuff that returns cached results (problematic) vs. keeping the code from getting itself in loops (which is what server_ids_seen does).

_repl_posn() -- is now pseudo-private (leading underscore)? (Re _pos_cmp())

Re short_host(): I think pt-slave-find needs to use Cxn and then move short_hosts()'s logic into Cxn::name() and enable via an optional arg like name(short => 1);

Overall, looks good. Make sure to update MasterSlave in all tools and then run a full test because messing with MasterSlave can introduce subtle bugs that only come up in certain cases.

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/masterslave-redesign-prototype]

420. By Daniel Nichter on 2012-10-20

Redirect sys cmd 2>/dev/null in pt-kill tests to avoid false-positive errors.

421. By Daniel Nichter on 2012-10-20

Fix RawLogParser.t. Use diag in PerconaTest.pm.

422. By Daniel Nichter on 2012-10-20

Remove all_privs tests. Update Percona::Toolkit::VERSION.

423. By Daniel Nichter on 2012-10-21

Make CompareResults.t stable--yet another case of not waiting for replication.

424. By Daniel Nichter on 2012-10-22

Merge fix-pt-osc-del-trg-bug-1062324.

425. By Daniel Nichter on 2012-10-22

Merge opt-parsing-exit-status-bug-1039074.

426. By Daniel Nichter on 2012-10-22

Merge quiet-progress-bug-1039541.

427. By Daniel Nichter on 2012-10-22

Merge pdl-partitions-bug-1043528.

428. By Daniel Nichter on 2012-10-24

Merge pt-stalk-iter-1-bug-1070434.

429. By Daniel Nichter on 2012-10-24

Merge find_my_cnf_file-bug-1070916.

430. By Daniel Nichter on 2012-10-24

Remove $Sandbox::Percona::Toolkit::VERSION and use $Percona::Toolkit::VERSION instead since it's the authoritative version.

431. By Daniel Nichter on 2012-10-25

Add deprecation notice to pt-log-player for PT 2.2.

432. By Daniel Nichter on 2012-10-25

Fix t/pt-slave-delay/auto_restart.t and use direct call, no backticks.

433. By Daniel Nichter on 2012-10-25

Don't use literal values for t/pt-heartbeat/basics.t 'It is being updated' test. Use direct call rather than backticks.

434. By Daniel Nichter on 2012-10-25

Make pt-archiver --sleep tests more precise and reliable.

435. By Daniel Nichter on 2012-10-26

Merge fix-ptc-slave-binglog-formats-on-5.0.

436. By Daniel Nichter on 2012-10-30

Merge pt-find-docu-bug-1013407

437. By Daniel Nichter on 2012-10-30

Merge fix-995896-cat-in-daemon

438. By Brian Fraser on 2012-10-31

Merged fix-821715-enable-local-infile-in-dsn

439. By Brian Fraser on 2012-10-31

Merged fix-1052722-pt-fifo-split-n-minus-1-rows-initially

440. By Brian Fraser on 2012-10-31

Updated modules in all tools

441. By Daniel Nichter on 2012-10-31

Merge fix-938660-ptc-chunk-size-limit-0

442. By Daniel Nichter on 2012-11-01

Merge pt-show-grant-col-privs-bug-866075

443. By Brian Fraser on 2012-11-02

Merged fix-1059732-ptc-hash-functions

444. By Brian Fraser on 2012-11-02

bin/pt-table-checksum: Missing word in an error message

445. By Daniel Nichter on 2012-11-05

Merge fix-1009510-1039569-ptc-check-table-on-replicas

446. By Daniel Nichter on 2012-11-05

Merged fix-i26211-1058285-821722-implicit-ansi_quotes

447. By Brian Fraser on 2012-11-07

Merged fix-1073532-Mo-Scalar-Util-PP

448. By Brian Fraser on 2012-11-07

Merged sandbox-get_dbh_for-fix

449. By Brian Fraser on 2012-11-07

Removed the L option from the dsn_opts exported by PerconaTest, as it was useless and breaking tests, and added an L=1 to a leftover pt-archiver --bulk-insert call

450. By Daniel Nichter on 2012-11-07

Merge fix-pt-fel-bug-1075773

451. By Daniel Nichter on 2012-11-08

Merge pt-osc-data-loss-bug-1068562

452. By Daniel Nichter on 2012-11-09

Merge fix-1045317-pt-osc-statistics

453. By Daniel Nichter on 2012-11-09

Remove duplicate code block I created by merge bits and pieces of branches, thereby confusing bzr.

454. By Brian Fraser on 2012-11-09

Merged OptionParser-remove-optional_value & updated modules

455. By Brian Fraser on 2012-11-09

t/pt-online-schema-change/basics.t: --statistics test outputs an extra line in 5.5

456. By Brian Fraser on 2012-11-09

Merged fix-1047335-crashed-tables

457. By Brian Fraser on 2012-11-09

Merged fix-1062563-1063912-ptc-pxc-bugs

458. By Brian Fraser on 2012-11-10

Missing /g in a Quoter regex

459. By Brian Fraser on 2012-11-10

Missing sample file for a pt-osc test

460. By Brian Fraser on 2012-11-14

Merged masterslave-redesign-prototype and resolved conflicts

461. By Brian Fraser on 2012-11-14

lib/MasterSlave.pm: Make get_slave_status work under PTDEBUG

462. By Brian Fraser on 2012-11-14

Cxn: Incorporate the short_host logic from pt-slave-find into ->name(), enabled by the short_host attribute

463. By Brian Fraser on 2012-11-14

bin/pt-slave-find: Use Cxn, remove short_host

464. By Brian Fraser on 2012-11-14

MasterSlave: stop using one-off prepared statements

465. By Brian Fraser on 2012-11-14

Fixed tests broken during the redesign

466. By Brian Fraser on 2012-11-14

Updated modules for all tools

Unmerged revisions

466. By Brian Fraser on 2012-11-14

Updated modules for all tools

465. By Brian Fraser on 2012-11-14

Fixed tests broken during the redesign

464. By Brian Fraser on 2012-11-14

MasterSlave: stop using one-off prepared statements

463. By Brian Fraser on 2012-11-14

bin/pt-slave-find: Use Cxn, remove short_host

462. By Brian Fraser on 2012-11-14

Cxn: Incorporate the short_host logic from pt-slave-find into ->name(), enabled by the short_host attribute

461. By Brian Fraser on 2012-11-14

lib/MasterSlave.pm: Make get_slave_status work under PTDEBUG

460. By Brian Fraser on 2012-11-14

Merged masterslave-redesign-prototype and resolved conflicts

=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2012-11-09 16:48:17 +0000
+++ bin/pt-archiver	2012-11-14 08:53:21 +0000
@@ -16,6 +16,7 @@
       Percona::Toolkit
       OptionParser
       Mo
+      Percona::Object
       TableParser
       DSNParser
       VersionParser
@@ -1138,7 +1139,6 @@
             push @args_to_delete, $attr;
          }
       }
-
       delete $args->{$_} for @args_to_delete;
 
       for my $attribute ( keys %$args ) {
@@ -1183,6 +1183,43 @@
       }
       return $ref;
    }
+
+   sub meta {
+      my $class = shift;
+      return Mo::Meta::Class->new(class => $class);
+   }
+}
+
+{
+   package Mo::Meta::Class;
+
+   sub new {
+      my $class = shift;
+      return bless { @_ }, $class
+   }
+
+   sub class { shift->{class} }
+
+   sub attributes {
+      my $self = shift;
+      return keys %{$metadata_for{$self->class}}
+   }
+
+   sub attributes_for_new {
+      my $self = shift;
+      my @attributes;
+
+      while ( my ($attr, $meta) = each %{$metadata_for{$self->class}} ) {
+         if ( exists $meta->{init_arg} ) {
+            push @attributes, $meta->{init_arg}
+                  if defined $meta->{init_arg};
+         }
+         else {
+            push @attributes, $attr;
+         }
+      }
+      return @attributes;
+   }
 }
 
 my %export_for;
@@ -1342,16 +1379,17 @@
 
 sub _check_type_constaints {
    my ($attribute, $I, $I_name, $val) = @_;
+   local $@;
    ( ref($I) eq 'CODE'
-      ? $I->($val)
+      ? eval { $I->($val) }
       : (ref $val eq $I
          || ($val && $val eq $I)
          || (exists $TYPES{$I} && $TYPES{$I}->($val)))
    )
    || Carp::confess(
-         qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$I_name' with value >
-      . (defined $val ? Mo::Dumper($val) : 'undef') )
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . ( $@ || ( qq<Validation failed for '$I_name' with value >
+      .           defined $val ? Mo::Dumper($val) : 'undef') ) )
 }
 
 sub _has_handles {
@@ -1524,6 +1562,52 @@
 # ###########################################################################
 
 # ###########################################################################
+# Percona::Object 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/Percona/Object.pm
+#   t/lib/Percona/Object.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Percona::Object;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Mo;
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+
+   return $args unless $args->{OptionParser};
+
+   my $o          = $args->{OptionParser};
+   my @attributes = $self->meta->attributes_for_new();
+
+   foreach my $attr ( @attributes ) {
+      next if exists $args->{$attr};
+      (my $attr_for_o = $attr) =~ tr/_/-/;
+      if ( $o->has($attr_for_o) ) {
+         $args->{$attr} = $o->get($attr_for_o)
+      } elsif ( $attr eq 'DSNParser' ) {
+         $args->{DSNParser} = $o->DSNParser;
+      }
+   }
+
+   return $args;
+}
+
+1;
+}
+# ###########################################################################
+# End Percona::Object package
+# ###########################################################################
+
+# ###########################################################################
 # TableParser 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,
@@ -1544,16 +1628,20 @@
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
    my $self = { %args };
+   $self->{Quoter} ||= Quoter->new();
    return bless $self, $class;
 }
 
+sub Quoter { shift->{Quoter} }
+
 sub get_create_table {
    my ( $self, $dbh, $db, $tbl ) = @_;
    die "I need a dbh parameter" unless $dbh;
@@ -2544,12 +2632,18 @@
 
 sub split_unquote {
    my ( $self, $db_tbl, $default_db ) = @_;
-   $db_tbl =~ s/`//g;
    my ( $db, $tbl ) = split(/[.]/, $db_tbl);
    if ( !$tbl ) {
       $tbl = $db;
       $db  = $default_db;
    }
+   for ($db, $tbl) {
+      next unless $_;
+      s/\A`//;
+      s/`\z//;
+      s/``/`/g;
+   }
+   
    return ($db, $tbl);
 }
 
@@ -3101,6 +3195,61 @@
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
+use Mo;
+
+extends qw( Percona::Object );
+
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
+has Quoter => (
+   is      => 'ro',
+   isa     => 'Quoter',
+   default => sub { Quoter->new() },
+);
+
+has DSNParser => (
+   is       => 'ro',
+   isa      => 'DSNParser',
+   required => 1,
+);
+
+has recursion_method => (
+   is       => 'ro',
+   isa      => sub {
+      die "recursion_method should be an arrayref, not " . ($_[0] || 'undef')
+         unless ref($_[0]) eq 'ARRAY';
+      check_recursion_method($_[0]);
+      return 1;
+   },
+   required => 1,
+);
+
+has _explicit_recursion_method => (
+   is      => 'ro',
+   isa     => 'Bool',
+   default => sub { 1 },
+);
+
+has recurse => (
+   is       => 'ro',
+   isa      => 'Maybe[Int]',
+   required => 1,
+);
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+   my $o    = delete $args->{OptionParser};
+
+   $args->{_explicit_recursion_method} = $o->got('recursion-method')
+      if $o;
+
+   return $args;
+}
+
 sub check_recursion_method {
    my ($methods) = @_;
 
@@ -3120,19 +3269,6 @@
    }
 }
 
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
 sub get_slaves {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
@@ -3142,10 +3278,10 @@
    my ($make_cxn) = @args{@required_args};
 
    my $slaves  = [];
-   my $dp      = $self->{DSNParser};
+   my $dp      = $self->DSNParser;
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   if ( grep { m/processlist|hosts/i } @$methods ) {
+   if ( grep { m/^(?:processlist|hosts)$/i } @$methods ) {
       my @required_args = qw(dbh dsn);
       foreach my $arg ( @required_args ) {
          die "I need a $arg argument" unless $args{$arg};
@@ -3184,24 +3320,20 @@
 
 sub _resolve_recursion_methods {
    my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
+   if ( !$self->_explicit_recursion_method() && $dsn && ($dsn->{P} || 3306) != 3306 ) {
       PTDEBUG && _d('Port number is non-standard; using only hosts method');
       return [qw(hosts)];
    }
    else {
-      return $o->get('recursion-method');
+      return $self->recursion_method();
    }
 }
 
 sub recurse_to_slaves {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
-   my $dp      = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
+   my $dp      = $self->DSNParser;
+   my $recurse = $args->{recurse} || $self->recurse();
    my $dsn     = $args->{dsn};
 
    my $methods = $self->_resolve_recursion_methods($dsn);
@@ -3245,7 +3377,7 @@
 
       my @slaves =
          grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+         $self->find_slave_hosts($dbh, $dsn, $methods);
 
       foreach my $slave ( @slaves ) {
          PTDEBUG && _d('Recursing from',
@@ -3257,7 +3389,8 @@
 }
 
 sub find_slave_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
+   my ( $self, $dbh, $dsn, $methods ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
@@ -3267,7 +3400,7 @@
    foreach my $method ( @$methods ) {
       my $find_slaves = "_find_slaves_by_$method";
       PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
+      @slaves = $self->$find_slaves($dbh, $dsn);
       last METHOD if @slaves;
    }
 
@@ -3276,7 +3409,8 @@
 }
 
 sub _find_slaves_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves = map  {
       my $slave        = $dsn_parser->parse("h=$_", $dsn);
@@ -3296,7 +3430,8 @@
 }
 
 sub _find_slaves_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves;
    my $sql = 'SHOW SLAVE HOSTS';
@@ -3407,41 +3542,32 @@
 }
 
 sub get_master_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
-   return       $dsn_parser->parse($spec, $dsn);
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
+   my $master     = $self->get_slave_status($dbh) or return undef;
+   my $spec       = "h=$master->{master_host},P=$master->{master_port}";
+   return $dsn_parser->parse($spec, $dsn);
 }
 
 sub get_slave_status {
    my ( $self, $dbh ) = @_;
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
-      $sth->execute();
-      my ($ss) = @{$sth->fetchall_arrayref({})};
-
-      if ( $ss && %$ss ) {
-         $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-         return $ss;
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+   my $sth = $dbh->prepare('SHOW SLAVE STATUS');
+   PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   $sth->execute();
+   my ($ss) = @{$sth->fetchall_arrayref({})};
+
+   if ( $ss && %$ss ) {
+      $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
+      return $ss;
    }
+
+   PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
 }
 
 sub get_master_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
-      return;
-   }
-
-   my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+   my $sth = $dbh->prepare('SHOW MASTER STATUS');
    PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
@@ -3451,7 +3577,6 @@
 
    if ( !$ms || scalar keys %$ms < 2 ) {
       PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
@@ -3492,8 +3617,7 @@
 
 sub stop_slave {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $sth = $dbh->prepare('STOP SLAVE');
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
@@ -3507,103 +3631,18 @@
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $dbh->prepare('START SLAVE');
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
-
-   my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
-
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
-            timeout       => $timeout,
-            master_status => $master_status
-      );
-      if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
-            }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
-         }
-         else {
-            die "Slave has not caught up to master and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Slave is already caught up to master");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub slave_is_running {
+sub _slave_is_running {
    my ( $self, $slave_status ) = @_;
    return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
-   my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
+sub _repl_posn {
    my ( $self, $status ) = @_;
    if ( exists $status->{file} && exists $status->{position} ) {
       return {
@@ -3626,89 +3665,10 @@
    return $stat->{seconds_behind_master};
 }
 
-sub pos_cmp {
+sub _pos_cmp {
    my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_; 
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
-         if ( $type ne 'all' ) { 
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($slave_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
-
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
+   return $self->_pos_to_string($a) cmp $self->_pos_to_string($b);
+}
 
 sub get_replication_filters {
    my ( $self, %args ) = @_;
@@ -3753,18 +3713,12 @@
 }
 
 
-sub pos_to_string {
+sub _pos_to_string {
    my ( $self, $pos ) = @_;
    my $fmt  = '%s/%020d';
    return sprintf($fmt, @{$pos}{qw(file position)});
 }
 
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
 sub get_cxn_from_dsn_table {
    my ($self, %args) = @_;
    my @required_args = qw(dsn_table_dsn make_cxn);
@@ -3774,8 +3728,8 @@
    my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
    PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
 
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
+   my $dp = $self->DSNParser;
+   my $q  = $self->Quoter;
 
    my $dsn = $dp->parse($dsn_table_dsn);
    my $dsn_table;

=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2012-11-09 16:48:17 +0000
+++ bin/pt-heartbeat	2012-11-14 08:53:21 +0000
@@ -46,6 +46,540 @@
 # ###########################################################################
 
 # ###########################################################################
+# Mo 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/Mo.pm
+#   t/lib/Mo.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+BEGIN {
+$INC{"Mo.pm"} = __FILE__;
+package Mo;
+our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
+
+{
+   no strict 'refs';
+   sub _glob_for {
+      return \*{shift()}
+   }
+
+   sub _stash_for {
+      return \%{ shift() . "::" };
+   }
+}
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(looks_like_number blessed);
+
+
+our %TYPES = (
+   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
+   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
+   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
+   Str    => sub { defined $_[0] },
+   Object => sub { defined $_[0] && blessed($_[0]) },
+   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
+
+   map {
+      my $type = /R/ ? $_ : uc $_;
+      $_ . "Ref" => sub { ref $_[0] eq $type }
+   } qw(Array Code Hash Regexp Glob Scalar)
+);
+
+our %metadata_for;
+{
+   package Mo::Object;
+
+   sub new {
+      my $class = shift;
+      my $args  = $class->BUILDARGS(@_);
+
+      my @args_to_delete;
+      while ( my ($attr, $meta) = each %{$metadata_for{$class}} ) {
+         next unless exists $meta->{init_arg};
+         my $init_arg = $meta->{init_arg};
+
+         if ( defined $init_arg ) {
+            $args->{$attr} = delete $args->{$init_arg};
+         }
+         else {
+            push @args_to_delete, $attr;
+         }
+      }
+      delete $args->{$_} for @args_to_delete;
+
+      for my $attribute ( keys %$args ) {
+         if ( my $coerce = $metadata_for{$class}{$attribute}{coerce} ) {
+            $args->{$attribute} = $coerce->($args->{$attribute});
+         }
+         if ( my $I = $metadata_for{$class}{$attribute}{isa} ) {
+            ( (my $I_name), $I ) = @{$I};
+            Mo::_check_type_constaints($attribute, $I, $I_name, $args->{$attribute});
+         }
+      }
+
+      while ( my ($attribute, $meta) = each %{$metadata_for{$class}} ) {
+         next unless $meta->{required};
+         Carp::confess("Attribute ($attribute) is required for $class")
+            if ! exists $args->{$attribute}
+      }
+
+      @_ = %$args;
+      my $self = bless $args, $class;
+
+      my @build_subs;
+      my $linearized_isa = mro::get_linear_isa($class);
+
+      for my $isa_class ( @$linearized_isa ) {
+         unshift @build_subs, *{ Mo::_glob_for "${isa_class}::BUILD" }{CODE};
+      }
+      exists &$_ && $_->( $self, @_ ) for grep { defined } @build_subs;
+      return $self;
+   }
+
+   sub BUILDARGS {
+      shift;
+      my $ref;
+      if ( @_ == 1 && ref($_[0]) ) {
+         Carp::confess("Single parameters to new() must be a HASH ref")
+            unless ref($_[0]) eq ref({});
+         $ref = {%{$_[0]}} # We want a new reference, always
+      }
+      else {
+         $ref = { @_ };
+      }
+      return $ref;
+   }
+
+   sub meta {
+      my $class = shift;
+      return Mo::Meta::Class->new(class => $class);
+   }
+}
+
+{
+   package Mo::Meta::Class;
+
+   sub new {
+      my $class = shift;
+      return bless { @_ }, $class
+   }
+
+   sub class { shift->{class} }
+
+   sub attributes {
+      my $self = shift;
+      return keys %{$metadata_for{$self->class}}
+   }
+
+   sub attributes_for_new {
+      my $self = shift;
+      my @attributes;
+
+      while ( my ($attr, $meta) = each %{$metadata_for{$self->class}} ) {
+         if ( exists $meta->{init_arg} ) {
+            push @attributes, $meta->{init_arg}
+                  if defined $meta->{init_arg};
+         }
+         else {
+            push @attributes, $attr;
+         }
+      }
+      return @attributes;
+   }
+}
+
+my %export_for;
+sub Mo::import {
+    warnings->import(qw(FATAL all));
+    strict->import();
+
+    my $caller     = scalar caller(); # Caller's package
+    my $caller_pkg = $caller . "::"; # Caller's package with :: at the end
+    my (%exports, %options);
+
+    my (undef, @features) = @_;
+    my %ignore = ( map { $_ => 1 } qw( is isa init_arg builder buildargs clearer predicate build handles default required ) );
+    for my $feature (grep { !$ignore{$_} } @features) {
+      { local $@; require "Mo/$feature.pm"; }
+      {
+         no strict 'refs';
+         &{"Mo::${feature}::e"}(
+                  $caller_pkg,
+                  \%exports,
+                  \%options,
+                  \@_
+            );
+      }
+    }
+
+    return if $exports{M};
+
+    %exports = (
+        extends => sub {
+            for my $class ( map { "$_" } @_ ) {
+               $class =~ s{::|'}{/}g;
+               { local $@; eval { require "$class.pm" } } # or warn $@;
+            }
+            _set_package_isa($caller, @_);
+            _set_inherited_metadata($caller);
+        },
+        has => sub {
+            my $names = shift;
+            for my $attribute ( ref $names ? @$names : $names ) {
+               my %args   = @_;
+               my $method = ($args{is} || '') eq 'ro'
+                  ? sub {
+                     Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller_pkg}${attribute}")
+                        if $#_;
+                     return $_[0]{$attribute};
+                  }
+                  : sub {
+                     return $#_
+                           ? $_[0]{$attribute} = $_[1]
+                           : $_[0]{$attribute};
+                  };
+
+               $metadata_for{$caller}{$attribute} = ();
+
+               if ( my $I = $args{isa} ) {
+                  my $orig_I = $I;
+                  my $type;
+                  if ( $I =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+                     $I = _nested_constraints($attribute, $1, $2);
+                  }
+                  $metadata_for{$caller}{$attribute}{isa} = [$orig_I, $I];
+                  my $orig_method = $method;
+                  $method = sub {
+                     if ( $#_ ) {
+                        Mo::_check_type_constaints($attribute, $I, $orig_I, $_[1]);
+                     }
+                     goto &$orig_method;
+                  };
+               }
+
+               if ( my $builder = $args{builder} ) {
+                  my $original_method = $method;
+                  $method = sub {
+                        $#_
+                           ? goto &$original_method
+                           : ! exists $_[0]{$attribute}
+                              ? $_[0]{$attribute} = $_[0]->$builder
+                              : goto &$original_method
+                  };
+               }
+
+               if ( my $code = $args{default} ) {
+                  Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
+                        unless ref($code) eq 'CODE';
+                  my $original_method = $method;
+                  $method = sub {
+                        $#_
+                           ? goto &$original_method
+                           : ! exists $_[0]{$attribute}
+                              ? $_[0]{$attribute} = $_[0]->$code
+                              : goto &$original_method
+                  };
+               }
+
+               if ( my $role = $args{does} ) {
+                  my $original_method = $method;
+                  $method = sub {
+                     if ( $#_ ) {
+                        Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
+                           unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
+                     }
+                     goto &$original_method
+                  };
+               }
+
+               if ( my $coercion = $args{coerce} ) {
+                  $metadata_for{$caller}{$attribute}{coerce} = $coercion;
+                  my $original_method = $method;
+                  $method = sub {
+                     if ( $#_ ) {
+                        return $original_method->($_[0], $coercion->($_[1]))
+                     }
+                     goto &$original_method;
+                  }
+               }
+
+               $method = $options{$_}->($method, $attribute, @_)
+                  for sort keys %options;
+
+               *{ _glob_for "${caller}::$attribute" } = $method;
+
+               if ( $args{required} ) {
+                  $metadata_for{$caller}{$attribute}{required} = 1;
+               }
+
+               if ($args{clearer}) {
+                  *{ _glob_for "${caller}::$args{clearer}" }
+                     = sub { delete shift->{$attribute} }
+               }
+
+               if ($args{predicate}) {
+                  *{ _glob_for "${caller}::$args{predicate}" }
+                     = sub { exists shift->{$attribute} }
+               }
+
+               if ($args{handles}) {
+                  _has_handles($caller, $attribute, \%args);
+               }
+
+               if (exists $args{init_arg}) {
+                  $metadata_for{$caller}{$attribute}{init_arg} = $args{init_arg};
+               }
+            }
+        },
+        %exports,
+    );
+
+    $export_for{$caller} = [ keys %exports ];
+
+    for my $keyword ( keys %exports ) {
+      *{ _glob_for "${caller}::$keyword" } = $exports{$keyword}
+    }
+    *{ _glob_for "${caller}::extends" }{CODE}->( "Mo::Object" )
+      unless @{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] };
+};
+
+sub _check_type_constaints {
+   my ($attribute, $I, $I_name, $val) = @_;
+   local $@;
+   ( ref($I) eq 'CODE'
+      ? eval { $I->($val) }
+      : (ref $val eq $I
+         || ($val && $val eq $I)
+         || (exists $TYPES{$I} && $TYPES{$I}->($val)))
+   )
+   || Carp::confess(
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . ( $@ || ( qq<Validation failed for '$I_name' with value >
+      .           defined $val ? Mo::Dumper($val) : 'undef') ) )
+}
+
+sub _has_handles {
+   my ($caller, $attribute, $args) = @_;
+   my $handles = $args->{handles};
+
+   my $ref = ref $handles;
+   my $kv;
+   if ( $ref eq ref [] ) {
+         $kv = { map { $_,$_ } @{$handles} };
+   }
+   elsif ( $ref eq ref {} ) {
+         $kv = $handles;
+   }
+   elsif ( $ref eq ref qr// ) {
+         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
+            unless $args->{isa};
+         my $target_class = $args->{isa};
+         $kv = {
+            map   { $_, $_     }
+            grep  { $_ =~ $handles }
+            grep  { !exists $Mo::Object::{$_} && $target_class->can($_) }
+            grep  { $_ ne 'has' && $_ ne 'extends' }
+            keys %{ _stash_for $target_class }
+         };
+   }
+   else {
+         Carp::confess("handles for $ref not yet implemented");
+   }
+
+   while ( my ($method, $target) = each %{$kv} ) {
+         my $name = _glob_for "${caller}::$method";
+         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
+            if defined &$name;
+
+         my ($target, @curried_args) = ref($target) ? @$target : $target;
+         *$name = sub {
+            my $self        = shift;
+            my $delegate_to = $self->$attribute();
+            my $error = "Cannot delegate $method to $target because the value of $attribute";
+            Carp::confess("$error is not defined") unless $delegate_to;
+            Carp::confess("$error is not an object (got '$delegate_to')")
+               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
+            return $delegate_to->$target(@curried_args, @_);
+         }
+   }
+}
+
+sub _nested_constraints {
+   my ($attribute, $aggregate_type, $type) = @_;
+
+   my $inner_types;
+   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+      $inner_types = _nested_constraints($1, $2);
+   }
+   else {
+      $inner_types = $TYPES{$type};
+   }
+
+   if ( $aggregate_type eq 'ArrayRef' ) {
+      return sub {
+         my ($val) = @_;
+         return unless ref($val) eq ref([]);
+
+         if ($inner_types) {
+            for my $value ( @{$val} ) {
+               return unless $inner_types->($value)
+            }
+         }
+         else {
+            for my $value ( @{$val} ) {
+               return unless $value && ($value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type)));
+            }
+         }
+         return 1;
+      };
+   }
+   elsif ( $aggregate_type eq 'Maybe' ) {
+      return sub {
+         my ($value) = @_;
+         return 1 if ! defined($value);
+         if ($inner_types) {
+            return unless $inner_types->($value)
+         }
+         else {
+            return unless $value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type));
+         }
+         return 1;
+      }
+   }
+   else {
+      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
+   }
+}
+
+sub _set_package_isa {
+   my ($package, @new_isa) = @_;
+
+   *{ _glob_for "${package}::ISA" } = [@new_isa];
+}
+
+sub _set_inherited_metadata {
+   my $class = shift;
+   my $linearized_isa = mro::get_linear_isa($class);
+   my %new_metadata;
+
+   for my $isa_class (reverse @$linearized_isa) {
+      %new_metadata = (
+         %new_metadata,
+         %{ $metadata_for{$isa_class} || {} },
+      );
+   }
+   $metadata_for{$class} = \%new_metadata;
+}
+
+sub unimport {
+   my $caller = scalar caller();
+   my $stash  = _stash_for( $caller );
+
+   delete $stash->{$_} for @{$export_for{$caller}};
+}
+
+sub Dumper {
+   require Data::Dumper;
+   local $Data::Dumper::Indent    = 0;
+   local $Data::Dumper::Sortkeys  = 0;
+   local $Data::Dumper::Quotekeys = 0;
+   local $Data::Dumper::Terse     = 1;
+
+   Data::Dumper::Dumper(@_)
+}
+
+BEGIN {
+   if ($] >= 5.010) {
+      { local $@; require mro; }
+   }
+   else {
+      local $@;
+      eval {
+         require MRO::Compat;
+      } or do {
+         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
+            no strict 'refs';
+
+            my $classname = shift;
+
+            my @lin = ($classname);
+            my %stored;
+            foreach my $parent (@{"$classname\::ISA"}) {
+               my $plin = mro::get_linear_isa_dfs($parent);
+               foreach (@$plin) {
+                     next if exists $stored{$_};
+                     push(@lin, $_);
+                     $stored{$_} = 1;
+               }
+            }
+            return \@lin;
+         };
+      }
+   }
+}
+
+}
+1;
+}
+# ###########################################################################
+# End Mo package
+# ###########################################################################
+
+# ###########################################################################
+# Percona::Object 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/Percona/Object.pm
+#   t/lib/Percona/Object.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Percona::Object;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Mo;
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+
+   return $args unless $args->{OptionParser};
+
+   my $o          = $args->{OptionParser};
+   my @attributes = $self->meta->attributes_for_new();
+
+   foreach my $attr ( @attributes ) {
+      next if exists $args->{$attr};
+      (my $attr_for_o = $attr) =~ tr/_/-/;
+      if ( $o->has($attr_for_o) ) {
+         $args->{$attr} = $o->get($attr_for_o)
+      } elsif ( $attr eq 'DSNParser' ) {
+         $args->{DSNParser} = $o->DSNParser;
+      }
+   }
+
+   return $args;
+}
+
+1;
+}
+# ###########################################################################
+# End Percona::Object package
+# ###########################################################################
+
+# ###########################################################################
 # MasterSlave 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,
@@ -61,6 +595,61 @@
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
+use Mo;
+
+extends qw( Percona::Object );
+
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
+has Quoter => (
+   is      => 'ro',
+   isa     => 'Quoter',
+   default => sub { Quoter->new() },
+);
+
+has DSNParser => (
+   is       => 'ro',
+   isa      => 'DSNParser',
+   required => 1,
+);
+
+has recursion_method => (
+   is       => 'ro',
+   isa      => sub {
+      die "recursion_method should be an arrayref, not " . ($_[0] || 'undef')
+         unless ref($_[0]) eq 'ARRAY';
+      check_recursion_method($_[0]);
+      return 1;
+   },
+   required => 1,
+);
+
+has _explicit_recursion_method => (
+   is      => 'ro',
+   isa     => 'Bool',
+   default => sub { 1 },
+);
+
+has recurse => (
+   is       => 'ro',
+   isa      => 'Maybe[Int]',
+   required => 1,
+);
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+   my $o    = delete $args->{OptionParser};
+
+   $args->{_explicit_recursion_method} = $o->got('recursion-method')
+      if $o;
+
+   return $args;
+}
+
 sub check_recursion_method {
    my ($methods) = @_;
 
@@ -80,19 +669,6 @@
    }
 }
 
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
 sub get_slaves {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
@@ -102,10 +678,10 @@
    my ($make_cxn) = @args{@required_args};
 
    my $slaves  = [];
-   my $dp      = $self->{DSNParser};
+   my $dp      = $self->DSNParser;
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   if ( grep { m/processlist|hosts/i } @$methods ) {
+   if ( grep { m/^(?:processlist|hosts)$/i } @$methods ) {
       my @required_args = qw(dbh dsn);
       foreach my $arg ( @required_args ) {
          die "I need a $arg argument" unless $args{$arg};
@@ -144,24 +720,20 @@
 
 sub _resolve_recursion_methods {
    my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
+   if ( !$self->_explicit_recursion_method() && $dsn && ($dsn->{P} || 3306) != 3306 ) {
       PTDEBUG && _d('Port number is non-standard; using only hosts method');
       return [qw(hosts)];
    }
    else {
-      return $o->get('recursion-method');
+      return $self->recursion_method();
    }
 }
 
 sub recurse_to_slaves {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
-   my $dp      = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
+   my $dp      = $self->DSNParser;
+   my $recurse = $args->{recurse} || $self->recurse();
    my $dsn     = $args->{dsn};
 
    my $methods = $self->_resolve_recursion_methods($dsn);
@@ -205,7 +777,7 @@
 
       my @slaves =
          grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+         $self->find_slave_hosts($dbh, $dsn, $methods);
 
       foreach my $slave ( @slaves ) {
          PTDEBUG && _d('Recursing from',
@@ -217,7 +789,8 @@
 }
 
 sub find_slave_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
+   my ( $self, $dbh, $dsn, $methods ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
@@ -227,7 +800,7 @@
    foreach my $method ( @$methods ) {
       my $find_slaves = "_find_slaves_by_$method";
       PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
+      @slaves = $self->$find_slaves($dbh, $dsn);
       last METHOD if @slaves;
    }
 
@@ -236,7 +809,8 @@
 }
 
 sub _find_slaves_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves = map  {
       my $slave        = $dsn_parser->parse("h=$_", $dsn);
@@ -256,7 +830,8 @@
 }
 
 sub _find_slaves_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves;
    my $sql = 'SHOW SLAVE HOSTS';
@@ -367,41 +942,32 @@
 }
 
 sub get_master_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
-   return       $dsn_parser->parse($spec, $dsn);
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
+   my $master     = $self->get_slave_status($dbh) or return undef;
+   my $spec       = "h=$master->{master_host},P=$master->{master_port}";
+   return $dsn_parser->parse($spec, $dsn);
 }
 
 sub get_slave_status {
    my ( $self, $dbh ) = @_;
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
-      $sth->execute();
-      my ($ss) = @{$sth->fetchall_arrayref({})};
-
-      if ( $ss && %$ss ) {
-         $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-         return $ss;
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+   my $sth = $dbh->prepare('SHOW SLAVE STATUS');
+   PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   $sth->execute();
+   my ($ss) = @{$sth->fetchall_arrayref({})};
+
+   if ( $ss && %$ss ) {
+      $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
+      return $ss;
    }
+
+   PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
 }
 
 sub get_master_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
-      return;
-   }
-
-   my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+   my $sth = $dbh->prepare('SHOW MASTER STATUS');
    PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
@@ -411,7 +977,6 @@
 
    if ( !$ms || scalar keys %$ms < 2 ) {
       PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
@@ -452,8 +1017,7 @@
 
 sub stop_slave {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $sth = $dbh->prepare('STOP SLAVE');
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
@@ -467,103 +1031,18 @@
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $dbh->prepare('START SLAVE');
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
-
-   my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
-
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
-            timeout       => $timeout,
-            master_status => $master_status
-      );
-      if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
-            }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
-         }
-         else {
-            die "Slave has not caught up to master and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Slave is already caught up to master");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub slave_is_running {
+sub _slave_is_running {
    my ( $self, $slave_status ) = @_;
    return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
-   my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
+sub _repl_posn {
    my ( $self, $status ) = @_;
    if ( exists $status->{file} && exists $status->{position} ) {
       return {
@@ -586,89 +1065,10 @@
    return $stat->{seconds_behind_master};
 }
 
-sub pos_cmp {
+sub _pos_cmp {
    my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_; 
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
-         if ( $type ne 'all' ) { 
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($slave_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
-
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
+   return $self->_pos_to_string($a) cmp $self->_pos_to_string($b);
+}
 
 sub get_replication_filters {
    my ( $self, %args ) = @_;
@@ -713,18 +1113,12 @@
 }
 
 
-sub pos_to_string {
+sub _pos_to_string {
    my ( $self, $pos ) = @_;
    my $fmt  = '%s/%020d';
    return sprintf($fmt, @{$pos}{qw(file position)});
 }
 
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
 sub get_cxn_from_dsn_table {
    my ($self, %args) = @_;
    my @required_args = qw(dsn_table_dsn make_cxn);
@@ -734,8 +1128,8 @@
    my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
    PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
 
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
+   my $dp = $self->DSNParser;
+   my $q  = $self->Quoter;
 
    my $dsn = $dp->parse($dsn_table_dsn);
    my $dsn_table;
@@ -2426,12 +2820,18 @@
 
 sub split_unquote {
    my ( $self, $db_tbl, $default_db ) = @_;
-   $db_tbl =~ s/`//g;
    my ( $db, $tbl ) = split(/[.]/, $db_tbl);
    if ( !$tbl ) {
       $tbl = $db;
       $db  = $default_db;
    }
+   for ($db, $tbl) {
+      next unless $_;
+      s/\A`//;
+      s/`\z//;
+      s/``/`/g;
+   }
+   
    return ($db, $tbl);
 }
 
@@ -2524,16 +2924,20 @@
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
    my $self = { %args };
+   $self->{Quoter} ||= Quoter->new();
    return bless $self, $class;
 }
 
+sub Quoter { shift->{Quoter} }
+
 sub get_create_table {
    my ( $self, $dbh, $db, $tbl ) = @_;
    die "I need a dbh parameter" unless $dbh;

=== modified file 'bin/pt-kill'
--- bin/pt-kill	2012-11-09 21:41:32 +0000
+++ bin/pt-kill	2012-11-14 08:53:21 +0000
@@ -15,14 +15,12 @@
    $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
       Percona::Toolkit
       OptionParser
-      Mo
       DSNParser
       Daemon
       Transformers
       TableParser
       Processlist
       TextResultSetParser
-      MasterSlave
       Quoter
       QueryRewriter
       Retry
@@ -1077,457 +1075,6 @@
 # ###########################################################################
 
 # ###########################################################################
-# Mo 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/Mo.pm
-#   t/lib/Mo.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-BEGIN {
-$INC{"Mo.pm"} = __FILE__;
-package Mo;
-our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
-
-{
-   no strict 'refs';
-   sub _glob_for {
-      return \*{shift()}
-   }
-
-   sub _stash_for {
-      return \%{ shift() . "::" };
-   }
-}
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-
-our %TYPES = (
-   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
-   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
-   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
-   Str    => sub { defined $_[0] },
-   Object => sub { defined $_[0] && blessed($_[0]) },
-   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
-
-   map {
-      my $type = /R/ ? $_ : uc $_;
-      $_ . "Ref" => sub { ref $_[0] eq $type }
-   } qw(Array Code Hash Regexp Glob Scalar)
-);
-
-our %metadata_for;
-{
-   package Mo::Object;
-
-   sub new {
-      my $class = shift;
-      my $args  = $class->BUILDARGS(@_);
-
-      my @args_to_delete;
-      while ( my ($attr, $meta) = each %{$metadata_for{$class}} ) {
-         next unless exists $meta->{init_arg};
-         my $init_arg = $meta->{init_arg};
-
-         if ( defined $init_arg ) {
-            $args->{$attr} = delete $args->{$init_arg};
-         }
-         else {
-            push @args_to_delete, $attr;
-         }
-      }
-
-      delete $args->{$_} for @args_to_delete;
-
-      for my $attribute ( keys %$args ) {
-         if ( my $coerce = $metadata_for{$class}{$attribute}{coerce} ) {
-            $args->{$attribute} = $coerce->($args->{$attribute});
-         }
-         if ( my $I = $metadata_for{$class}{$attribute}{isa} ) {
-            ( (my $I_name), $I ) = @{$I};
-            Mo::_check_type_constaints($attribute, $I, $I_name, $args->{$attribute});
-         }
-      }
-
-      while ( my ($attribute, $meta) = each %{$metadata_for{$class}} ) {
-         next unless $meta->{required};
-         Carp::confess("Attribute ($attribute) is required for $class")
-            if ! exists $args->{$attribute}
-      }
-
-      @_ = %$args;
-      my $self = bless $args, $class;
-
-      my @build_subs;
-      my $linearized_isa = mro::get_linear_isa($class);
-
-      for my $isa_class ( @$linearized_isa ) {
-         unshift @build_subs, *{ Mo::_glob_for "${isa_class}::BUILD" }{CODE};
-      }
-      exists &$_ && $_->( $self, @_ ) for grep { defined } @build_subs;
-      return $self;
-   }
-
-   sub BUILDARGS {
-      shift;
-      my $ref;
-      if ( @_ == 1 && ref($_[0]) ) {
-         Carp::confess("Single parameters to new() must be a HASH ref")
-            unless ref($_[0]) eq ref({});
-         $ref = {%{$_[0]}} # We want a new reference, always
-      }
-      else {
-         $ref = { @_ };
-      }
-      return $ref;
-   }
-}
-
-my %export_for;
-sub Mo::import {
-    warnings->import(qw(FATAL all));
-    strict->import();
-    
-    my $caller     = scalar caller(); # Caller's package
-    my $caller_pkg = $caller . "::"; # Caller's package with :: at the end
-    my (%exports, %options);
-
-    my (undef, @features) = @_;
-    my %ignore = ( map { $_ => 1 } qw( is isa init_arg builder buildargs clearer predicate build handles default required ) );
-    for my $feature (grep { !$ignore{$_} } @features) {
-      { local $@; require "Mo/$feature.pm"; }
-      {
-         no strict 'refs';
-         &{"Mo::${feature}::e"}(
-                  $caller_pkg,
-                  \%exports,
-                  \%options,
-                  \@_
-            );
-      }
-    }
-
-    return if $exports{M}; 
-
-    %exports = (
-        extends => sub {
-            for my $class ( map { "$_" } @_ ) {
-               $class =~ s{::|'}{/}g;
-               { local $@; eval { require "$class.pm" } } # or warn $@;
-            }
-            _set_package_isa($caller, @_);
-            _set_inherited_metadata($caller);
-        },
-        has => sub {
-            my $names = shift;
-            for my $attribute ( ref $names ? @$names : $names ) {
-               my %args   = @_;
-               my $method = ($args{is} || '') eq 'ro'
-                  ? sub {
-                     Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller_pkg}${attribute}")
-                        if $#_;
-                     return $_[0]{$attribute};
-                  }
-                  : sub {
-                     return $#_
-                           ? $_[0]{$attribute} = $_[1]
-                           : $_[0]{$attribute};
-                  };
-
-               $metadata_for{$caller}{$attribute} = ();
-
-               if ( my $I = $args{isa} ) {
-                  my $orig_I = $I;
-                  my $type;
-                  if ( $I =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-                     $I = _nested_constraints($attribute, $1, $2);
-                  }
-                  $metadata_for{$caller}{$attribute}{isa} = [$orig_I, $I];
-                  my $orig_method = $method;
-                  $method = sub {
-                     if ( $#_ ) {
-                        Mo::_check_type_constaints($attribute, $I, $orig_I, $_[1]);
-                     }
-                     goto &$orig_method;
-                  };
-               }
-
-               if ( my $builder = $args{builder} ) {
-                  my $original_method = $method;
-                  $method = sub {
-                        $#_
-                           ? goto &$original_method
-                           : ! exists $_[0]{$attribute}
-                              ? $_[0]{$attribute} = $_[0]->$builder
-                              : goto &$original_method
-                  };
-               }
-
-               if ( my $code = $args{default} ) {
-                  Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
-                        unless ref($code) eq 'CODE';
-                  my $original_method = $method;
-                  $method = sub {
-                        $#_
-                           ? goto &$original_method
-                           : ! exists $_[0]{$attribute}
-                              ? $_[0]{$attribute} = $_[0]->$code
-                              : goto &$original_method
-                  };
-               }
-
-               if ( my $role = $args{does} ) {
-                  my $original_method = $method;
-                  $method = sub {
-                     if ( $#_ ) {
-                        Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
-                           unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
-                     }
-                     goto &$original_method
-                  };
-               }
-
-               if ( my $coercion = $args{coerce} ) {
-                  $metadata_for{$caller}{$attribute}{coerce} = $coercion;
-                  my $original_method = $method;
-                  $method = sub {
-                     if ( $#_ ) {
-                        return $original_method->($_[0], $coercion->($_[1]))
-                     }
-                     goto &$original_method;
-                  }
-               }
-
-               $method = $options{$_}->($method, $attribute, @_)
-                  for sort keys %options;
-
-               *{ _glob_for "${caller}::$attribute" } = $method;
-
-               if ( $args{required} ) {
-                  $metadata_for{$caller}{$attribute}{required} = 1;
-               }
-
-               if ($args{clearer}) {
-                  *{ _glob_for "${caller}::$args{clearer}" }
-                     = sub { delete shift->{$attribute} }
-               }
-
-               if ($args{predicate}) {
-                  *{ _glob_for "${caller}::$args{predicate}" }
-                     = sub { exists shift->{$attribute} }
-               }
-
-               if ($args{handles}) {
-                  _has_handles($caller, $attribute, \%args);
-               }
-
-               if (exists $args{init_arg}) {
-                  $metadata_for{$caller}{$attribute}{init_arg} = $args{init_arg};
-               }
-            }
-        },
-        %exports,
-    );
-
-    $export_for{$caller} = [ keys %exports ];
-
-    for my $keyword ( keys %exports ) {
-      *{ _glob_for "${caller}::$keyword" } = $exports{$keyword}
-    }
-    *{ _glob_for "${caller}::extends" }{CODE}->( "Mo::Object" )
-      unless @{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] };
-};
-
-sub _check_type_constaints {
-   my ($attribute, $I, $I_name, $val) = @_;
-   ( ref($I) eq 'CODE'
-      ? $I->($val)
-      : (ref $val eq $I
-         || ($val && $val eq $I)
-         || (exists $TYPES{$I} && $TYPES{$I}->($val)))
-   )
-   || Carp::confess(
-         qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$I_name' with value >
-      . (defined $val ? Mo::Dumper($val) : 'undef') )
-}
-
-sub _has_handles {
-   my ($caller, $attribute, $args) = @_;
-   my $handles = $args->{handles};
-
-   my $ref = ref $handles;
-   my $kv;
-   if ( $ref eq ref [] ) {
-         $kv = { map { $_,$_ } @{$handles} };
-   }
-   elsif ( $ref eq ref {} ) {
-         $kv = $handles;
-   }
-   elsif ( $ref eq ref qr// ) {
-         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
-            unless $args->{isa};
-         my $target_class = $args->{isa};
-         $kv = {
-            map   { $_, $_     }
-            grep  { $_ =~ $handles }
-            grep  { !exists $Mo::Object::{$_} && $target_class->can($_) }
-            grep  { $_ ne 'has' && $_ ne 'extends' }
-            keys %{ _stash_for $target_class }
-         };
-   }
-   else {
-         Carp::confess("handles for $ref not yet implemented");
-   }
-
-   while ( my ($method, $target) = each %{$kv} ) {
-         my $name = _glob_for "${caller}::$method";
-         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
-            if defined &$name;
-
-         my ($target, @curried_args) = ref($target) ? @$target : $target;
-         *$name = sub {
-            my $self        = shift;
-            my $delegate_to = $self->$attribute();
-            my $error = "Cannot delegate $method to $target because the value of $attribute";
-            Carp::confess("$error is not defined") unless $delegate_to;
-            Carp::confess("$error is not an object (got '$delegate_to')")
-               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
-            return $delegate_to->$target(@curried_args, @_);
-         }
-   }
-}
-
-sub _nested_constraints {
-   my ($attribute, $aggregate_type, $type) = @_;
-
-   my $inner_types;
-   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-      $inner_types = _nested_constraints($1, $2);
-   }
-   else {
-      $inner_types = $TYPES{$type};
-   }
-
-   if ( $aggregate_type eq 'ArrayRef' ) {
-      return sub {
-         my ($val) = @_;
-         return unless ref($val) eq ref([]);
-
-         if ($inner_types) {
-            for my $value ( @{$val} ) {
-               return unless $inner_types->($value) 
-            }
-         }
-         else {
-            for my $value ( @{$val} ) {
-               return unless $value && ($value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type)));
-            }
-         }
-         return 1;
-      };
-   }
-   elsif ( $aggregate_type eq 'Maybe' ) {
-      return sub {
-         my ($value) = @_;
-         return 1 if ! defined($value);
-         if ($inner_types) {
-            return unless $inner_types->($value) 
-         }
-         else {
-            return unless $value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type));
-         }
-         return 1;
-      }
-   }
-   else {
-      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
-   }
-}
-
-sub _set_package_isa {
-   my ($package, @new_isa) = @_;
-
-   *{ _glob_for "${package}::ISA" } = [@new_isa];
-}
-
-sub _set_inherited_metadata {
-   my $class = shift;
-   my $linearized_isa = mro::get_linear_isa($class);
-   my %new_metadata;
-
-   for my $isa_class (reverse @$linearized_isa) {
-      %new_metadata = (
-         %new_metadata,
-         %{ $metadata_for{$isa_class} || {} },
-      );
-   }
-   $metadata_for{$class} = \%new_metadata;
-}
-
-sub unimport {
-   my $caller = scalar caller();
-   my $stash  = _stash_for( $caller );
-
-   delete $stash->{$_} for @{$export_for{$caller}};
-}
-
-sub Dumper {
-   require Data::Dumper;
-   local $Data::Dumper::Indent    = 0;
-   local $Data::Dumper::Sortkeys  = 0;
-   local $Data::Dumper::Quotekeys = 0;
-   local $Data::Dumper::Terse     = 1;
-
-   Data::Dumper::Dumper(@_)
-}
-
-BEGIN {
-   if ($] >= 5.010) {
-      { local $@; require mro; }
-   }
-   else {
-      local $@;
-      eval {
-         require MRO::Compat;
-      } or do {
-         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
-            no strict 'refs';
-
-            my $classname = shift;
-
-            my @lin = ($classname);
-            my %stored;
-            foreach my $parent (@{"$classname\::ISA"}) {
-               my $plin = mro::get_linear_isa_dfs($parent);
-               foreach (@$plin) {
-                     next if exists $stored{$_};
-                     push(@lin, $_);
-                     $stored{$_} = 1;
-               }
-            }
-            return \@lin;
-         };
-      }
-   }
-}
-
-}
-1;
-}
-# ###########################################################################
-# End Mo package
-# ###########################################################################
-
-# ###########################################################################
 # DSNParser 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,
@@ -2905,7 +2452,7 @@
 
 sub new {
    my ( $class, %args ) = @_;
-   foreach my $arg ( qw(MasterSlave) ) {
+   foreach my $arg ( qw() ) {
       die "I need a $arg argument" unless $args{$arg};
    }
    my $self = {
@@ -3105,7 +2652,6 @@
 sub find {
    my ( $self, $proclist, %find_spec ) = @_;
    PTDEBUG && _d('find specs:', Dumper(\%find_spec));
-   my $ms  = $self->{MasterSlave};
 
    my @matches;
    QUERY:
@@ -3114,7 +2660,7 @@
       my $matched = 0;
 
       if (    !$find_spec{replication_threads}
-           && $ms->is_replication_thread($query) ) {
+           && $self->is_replication_thread($query) ) {
          PTDEBUG && _d('Skipping replication thread');
          next QUERY;
       }
@@ -3214,6 +2760,75 @@
       && $query->{Info} =~ m/$property/;
 }
 
+sub is_replication_thread {
+   my ( $self, $query, %args ) = @_; 
+   return unless $query;
+
+   my $type = lc($args{type} || 'all');
+   die "Invalid type: $type"
+      unless $type =~ m/^(?:binlog_dump|slave_io|slave_sql|all)$/i;
+
+   my $match = 0;
+   if ( $type =~ m/binlog_dump|all/i ) {
+      $match = 1
+         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
+   }
+   if ( !$match ) {
+      if ( lc($query->{User} || $query->{user} || '') eq "system user" ) {
+         PTDEBUG && _d("Slave replication thread");
+         if ( $type ne 'all' ) { 
+            my $state = $query->{State} || $query->{state} || '';
+
+            if ( $state =~ m/^(?:init|end)$/ ) {
+               PTDEBUG && _d("Special state:", $state);
+               $match = 1;
+            }
+            else {
+               my ($slave_sql) = $state =~ m/
+                  ^(Waiting\sfor\sthe\snext\sevent
+                   |Reading\sevent\sfrom\sthe\srelay\slog
+                   |Has\sread\sall\srelay\slog;\swaiting
+                   |Making\stemp\sfile
+                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
+
+               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
+                      : $type eq 'slave_io'  && !$slave_sql ? 1
+                      :                                       0;
+            }
+         }
+         else {
+            $match = 1;
+         }
+      }
+      else {
+         PTDEBUG && _d('Not system user');
+      }
+
+      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
+         my $id = $query->{Id} || $query->{id};
+         if ( $match ) {
+            $self->{_replication_thread}->{$id} = 1;
+         }
+         else {
+            if ( $self->{_replication_thread}->{$id} ) {
+               PTDEBUG && _d("Thread ID is a known replication thread ID");
+               $match = 1;
+            }
+         }
+      }
+   }
+
+   PTDEBUG && _d('Matches', $type, 'replication thread:',
+      ($match ? 'yes' : 'no'), '; match:', $match);
+
+   return $match;
+}
+
+sub reset_known_replication_threads {
+   my ($self) = @_;
+   $self->{_replication_thread} = {};
+}
+
 sub _d {
    my ($package, undef, $line) = caller 0;
    @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
@@ -3373,740 +2988,6 @@
 # ###########################################################################
 
 # ###########################################################################
-# MasterSlave 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/MasterSlave.pm
-#   t/lib/MasterSlave.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-package MasterSlave;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub check_recursion_method {
-   my ($methods) = @_;
-
-   if ( @$methods != 1 ) {
-      if ( grep({ !m/processlist|hosts/i } @$methods)
-            && $methods->[0] !~ /^dsn=/i )
-      {
-         die  "Invalid combination of recursion methods: "
-            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
-            . "Only hosts and processlist may be combined.\n"
-      }
-   }
-   else {
-      my ($method) = @$methods;
-      die "Invalid recursion method: " . ( $method || 'undef' )
-         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|dsn=)/i;
-   }
-}
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
-sub get_slaves {
-   my ($self, %args) = @_;
-   my @required_args = qw(make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($make_cxn) = @args{@required_args};
-
-   my $slaves  = [];
-   my $dp      = $self->{DSNParser};
-   my $methods = $self->_resolve_recursion_methods($args{dsn});
-
-   if ( grep { m/processlist|hosts/i } @$methods ) {
-      my @required_args = qw(dbh dsn);
-      foreach my $arg ( @required_args ) {
-         die "I need a $arg argument" unless $args{$arg};
-      }
-      my ($dbh, $dsn) = @args{@required_args};
-      
-      $self->recurse_to_slaves(
-         {  dbh       => $dbh,
-            dsn       => $dsn,
-            callback  => sub {
-               my ( $dsn, $dbh, $level, $parent ) = @_;
-               return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               push @$slaves, $make_cxn->(dsn => $dsn, dbh => $dbh);
-               return;
-            },
-         }
-      );
-   }
-   elsif ( $methods->[0] =~ m/^dsn=/i ) {
-      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
-         %args,
-         dsn_table_dsn => $dsn_table_dsn,
-      );
-   }
-   elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
-   }
-   else {
-      die "Unexpected recursion methods: @$methods";
-   }
-   
-   return $slaves;
-}
-
-sub _resolve_recursion_methods {
-   my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
-      PTDEBUG && _d('Port number is non-standard; using only hosts method');
-      return [qw(hosts)];
-   }
-   else {
-      return $o->get('recursion-method');
-   }
-}
-
-sub recurse_to_slaves {
-   my ( $self, $args, $level ) = @_;
-   $level ||= 0;
-   my $dp      = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
-   my $dsn     = $args->{dsn};
-
-   my $methods = $self->_resolve_recursion_methods($dsn);
-   PTDEBUG && _d('Recursion methods:', @$methods);
-   if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
-      return;
-   }
-
-   my $dbh;
-   eval {
-      $dbh = $args->{dbh} || $dp->get_dbh(
-         $dp->get_cxn_params($dsn), { AutoCommit => 1 });
-      PTDEBUG && _d('Connected to', $dp->as_string($dsn));
-   };
-   if ( $EVAL_ERROR ) {
-      print STDERR "Cannot connect to ", $dp->as_string($dsn), "\n"
-         or die "Cannot print: $OS_ERROR";
-      return;
-   }
-
-   my $sql  = 'SELECT @@SERVER_ID';
-   PTDEBUG && _d($sql);
-   my ($id) = $dbh->selectrow_array($sql);
-   PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
-   if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
-       || $args->{server_ids_seen}->{$id}++
-   ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
-      if ( $args->{skip_callback} ) {
-         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
-      }
-      return;
-   }
-
-   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
-
-   if ( !defined $recurse || $level < $recurse ) {
-
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
-
-      foreach my $slave ( @slaves ) {
-         PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn }, $level + 1 );
-      }
-   }
-}
-
-sub find_slave_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
-
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
-      'using methods', @$methods);
-
-   my @slaves;
-   METHOD:
-   foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
-   }
-
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
-}
-
-sub _find_slaves_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
-   }
-   grep { $_ }
-   map  {
-      my ( $host ) = $_->{host} =~ m/^([^:]+):/;
-      if ( $host eq 'localhost' ) {
-         $host = '127.0.0.1'; # Replication never uses sockets.
-      }
-      $host;
-   } $self->get_connected_slaves($dbh);
-
-   return @slaves;
-}
-
-sub _find_slaves_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
-   PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         my $spec = "h=$hash{host},P=$hash{port}"
-            . ( $hash{user} ? ",u=$hash{user}" : '')
-            . ( $hash{password} ? ",p=$hash{password}" : '');
-         my $dsn           = $dsn_parser->parse($spec, $dsn);
-         $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
-         $dsn->{source}    = 'hosts';
-         $dsn;
-      } @slaves;
-   }
-
-   return @slaves;
-}
-
-sub get_connected_slaves {
-   my ( $self, $dbh ) = @_;
-
-   my $show = "SHOW GRANTS FOR ";
-   my $user = 'CURRENT_USER()';
-   my $sql = $show . $user;
-   PTDEBUG && _d($dbh, $sql);
-
-   my $proc;
-   eval {
-      $proc = grep {
-         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-      } @{$dbh->selectcol_arrayref($sql)};
-   };
-   if ( $EVAL_ERROR ) {
-
-      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
-         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
-            $EVAL_ERROR);
-         ($user) = split('@', $user);
-         $sql    = $show . $user;
-         PTDEBUG && _d($sql);
-         eval {
-            $proc = grep {
-               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-            } @{$dbh->selectcol_arrayref($sql)};
-         };
-      }
-
-      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
-   }
-   if ( !$proc ) {
-      die "You do not have the PROCESS privilege";
-   }
-
-   $sql = 'SHOW PROCESSLIST';
-   PTDEBUG && _d($dbh, $sql);
-   grep { $_->{command} =~ m/Binlog Dump/i }
-   map  { # Lowercase the column names
-      my %hash;
-      @hash{ map { lc $_ } keys %$_ } = values %$_;
-      \%hash;
-   }
-   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-}
-
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
-
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
-   }
-
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
-   }
-
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
-   {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
-      {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
-      }
-   }
-   return 1;
-}
-
-sub get_master_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
-   return       $dsn_parser->parse($spec, $dsn);
-}
-
-sub get_slave_status {
-   my ( $self, $dbh ) = @_;
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
-      $sth->execute();
-      my ($ss) = @{$sth->fetchall_arrayref({})};
-
-      if ( $ss && %$ss ) {
-         $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-         return $ss;
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
-   }
-}
-
-sub get_master_status {
-   my ( $self, $dbh ) = @_;
-
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
-      return;
-   }
-
-   my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
-   $sth->execute();
-   my ($ms) = @{$sth->fetchall_arrayref({})};
-   PTDEBUG && _d(
-      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
-          : '');
-
-   if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
-   }
-
-  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
-}
-
-sub wait_for_master {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($master_status, $slave_dbh) = @args{@required_args};
-   my $timeout       = $args{timeout} || 60;
-
-   my $result;
-   my $waited;
-   if ( $master_status ) {
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', "
-              . "$master_status->{position}, $timeout)";
-      PTDEBUG && _d($slave_dbh, $sql);
-      my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
-
-      $waited = time - $start;
-
-      PTDEBUG && _d('Result of waiting:', $result);
-      PTDEBUG && _d("Waited", $waited, "seconds");
-   }
-   else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
-   }
-
-   return {
-      result => $result,
-      waited => $waited,
-   };
-}
-
-sub stop_slave {
-   my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
-   PTDEBUG && _d($dbh, $sth->{Statement});
-   $sth->execute();
-}
-
-sub start_slave {
-   my ( $self, $dbh, $pos ) = @_;
-   if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
-      PTDEBUG && _d($dbh, $sql);
-      $dbh->do($sql);
-   }
-   else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
-      PTDEBUG && _d($dbh, $sth->{Statement});
-      $sth->execute();
-   }
-}
-
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
-
-   my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
-
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
-            timeout       => $timeout,
-            master_status => $master_status
-      );
-      if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
-            }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
-         }
-         else {
-            die "Slave has not caught up to master and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Slave is already caught up to master");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
-}
-
-sub has_slave_updates {
-   my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
-   my ( $self, $status ) = @_;
-   if ( exists $status->{file} && exists $status->{position} ) {
-      return {
-         file     => $status->{file},
-         position => $status->{position},
-      };
-   }
-   else {
-      return {
-         file     => $status->{relay_master_log_file},
-         position => $status->{exec_master_log_pos},
-      };
-   }
-}
-
-sub get_slave_lag {
-   my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
-}
-
-sub pos_cmp {
-   my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_; 
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
-         if ( $type ne 'all' ) { 
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($slave_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
-
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
-
-sub get_replication_filters {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dbh) = @args{@required_args};
-
-   my %filters = ();
-
-   my $status = $self->get_master_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         binlog_do_db
-         binlog_ignore_db
-      );
-   }
-
-   $status = $self->get_slave_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         replicate_do_db
-         replicate_ignore_db
-         replicate_do_table
-         replicate_ignore_table 
-         replicate_wild_do_table
-         replicate_wild_ignore_table
-      );
-
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
-      PTDEBUG && _d($dbh, $sql);
-      my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
-   }
-
-   return \%filters; 
-}
-
-
-sub pos_to_string {
-   my ( $self, $pos ) = @_;
-   my $fmt  = '%s/%020d';
-   return sprintf($fmt, @{$pos}{qw(file position)});
-}
-
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
-sub get_cxn_from_dsn_table {
-   my ($self, %args) = @_;
-   my @required_args = qw(dsn_table_dsn make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
-   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
-
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
-
-   my $dsn = $dp->parse($dsn_table_dsn);
-   my $dsn_table;
-   if ( $dsn->{D} && $dsn->{t} ) {
-      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
-   }
-   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
-      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
-   }
-   else {
-      die "DSN table DSN does not specify a database (D) "
-        . "or a database-qualified table (t)";
-   }
-
-   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
-   my $dbh         = $dsn_tbl_cxn->connect();
-   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
-   PTDEBUG && _d($sql);
-   my $dsn_strings = $dbh->selectcol_arrayref($sql);
-   my @cxn;
-   if ( $dsn_strings ) {
-      foreach my $dsn_string ( @$dsn_strings ) {
-         PTDEBUG && _d('DSN from DSN table:', $dsn_string);
-         push @cxn, $make_cxn->(dsn_string => $dsn_string);
-      }
-   }
-   return \@cxn;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End MasterSlave package
-# ###########################################################################
-
-# ###########################################################################
 # Quoter 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,
@@ -4149,12 +3030,18 @@
 
 sub split_unquote {
    my ( $self, $db_tbl, $default_db ) = @_;
-   $db_tbl =~ s/`//g;
    my ( $db, $tbl ) = split(/[.]/, $db_tbl);
    if ( !$tbl ) {
       $tbl = $db;
       $db  = $default_db;
    }
+   for ($db, $tbl) {
+      next unless $_;
+      s/\A`//;
+      s/`\z//;
+      s/``/`/g;
+   }
+   
    return ($db, $tbl);
 }
 
@@ -6260,12 +5147,7 @@
    # ########################################################################
    # Make input sub that will either get processlist from MySQL or a file.
    # ########################################################################
-   my $ms = new MasterSlave(
-      OptionParser => $o,
-      DSNParser    => $dp,
-      Quoter       => "Quoter",
-   );
-   my $pl = new Processlist(MasterSlave => $ms);
+   my $pl = new Processlist();
    my $qr = new QueryRewriter();
 
    my $cxn;

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2012-11-10 12:54:39 +0000
+++ bin/pt-online-schema-change	2012-11-14 08:53:21 +0000
@@ -16,6 +16,7 @@
       Percona::Toolkit
       OptionParser
       Mo
+      Percona::Object
       VersionParser
       DSNParser
       Daemon
@@ -1149,7 +1150,6 @@
             push @args_to_delete, $attr;
          }
       }
-
       delete $args->{$_} for @args_to_delete;
 
       for my $attribute ( keys %$args ) {
@@ -1194,6 +1194,43 @@
       }
       return $ref;
    }
+
+   sub meta {
+      my $class = shift;
+      return Mo::Meta::Class->new(class => $class);
+   }
+}
+
+{
+   package Mo::Meta::Class;
+
+   sub new {
+      my $class = shift;
+      return bless { @_ }, $class
+   }
+
+   sub class { shift->{class} }
+
+   sub attributes {
+      my $self = shift;
+      return keys %{$metadata_for{$self->class}}
+   }
+
+   sub attributes_for_new {
+      my $self = shift;
+      my @attributes;
+
+      while ( my ($attr, $meta) = each %{$metadata_for{$self->class}} ) {
+         if ( exists $meta->{init_arg} ) {
+            push @attributes, $meta->{init_arg}
+                  if defined $meta->{init_arg};
+         }
+         else {
+            push @attributes, $attr;
+         }
+      }
+      return @attributes;
+   }
 }
 
 my %export_for;
@@ -1353,16 +1390,17 @@
 
 sub _check_type_constaints {
    my ($attribute, $I, $I_name, $val) = @_;
+   local $@;
    ( ref($I) eq 'CODE'
-      ? $I->($val)
+      ? eval { $I->($val) }
       : (ref $val eq $I
          || ($val && $val eq $I)
          || (exists $TYPES{$I} && $TYPES{$I}->($val)))
    )
    || Carp::confess(
-         qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$I_name' with value >
-      . (defined $val ? Mo::Dumper($val) : 'undef') )
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . ( $@ || ( qq<Validation failed for '$I_name' with value >
+      .           defined $val ? Mo::Dumper($val) : 'undef') ) )
 }
 
 sub _has_handles {
@@ -1535,6 +1573,52 @@
 # ###########################################################################
 
 # ###########################################################################
+# Percona::Object 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/Percona/Object.pm
+#   t/lib/Percona/Object.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Percona::Object;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Mo;
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+
+   return $args unless $args->{OptionParser};
+
+   my $o          = $args->{OptionParser};
+   my @attributes = $self->meta->attributes_for_new();
+
+   foreach my $attr ( @attributes ) {
+      next if exists $args->{$attr};
+      (my $attr_for_o = $attr) =~ tr/_/-/;
+      if ( $o->has($attr_for_o) ) {
+         $args->{$attr} = $o->get($attr_for_o)
+      } elsif ( $attr eq 'DSNParser' ) {
+         $args->{DSNParser} = $o->DSNParser;
+      }
+   }
+
+   return $args;
+}
+
+1;
+}
+# ###########################################################################
+# End Percona::Object package
+# ###########################################################################
+
+# ###########################################################################
 # VersionParser 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,
@@ -3847,6 +3931,61 @@
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
+use Mo;
+
+extends qw( Percona::Object );
+
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
+has Quoter => (
+   is      => 'ro',
+   isa     => 'Quoter',
+   default => sub { Quoter->new() },
+);
+
+has DSNParser => (
+   is       => 'ro',
+   isa      => 'DSNParser',
+   required => 1,
+);
+
+has recursion_method => (
+   is       => 'ro',
+   isa      => sub {
+      die "recursion_method should be an arrayref, not " . ($_[0] || 'undef')
+         unless ref($_[0]) eq 'ARRAY';
+      check_recursion_method($_[0]);
+      return 1;
+   },
+   required => 1,
+);
+
+has _explicit_recursion_method => (
+   is      => 'ro',
+   isa     => 'Bool',
+   default => sub { 1 },
+);
+
+has recurse => (
+   is       => 'ro',
+   isa      => 'Maybe[Int]',
+   required => 1,
+);
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+   my $o    = delete $args->{OptionParser};
+
+   $args->{_explicit_recursion_method} = $o->got('recursion-method')
+      if $o;
+
+   return $args;
+}
+
 sub check_recursion_method {
    my ($methods) = @_;
 
@@ -3866,19 +4005,6 @@
    }
 }
 
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
 sub get_slaves {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
@@ -3888,10 +4014,10 @@
    my ($make_cxn) = @args{@required_args};
 
    my $slaves  = [];
-   my $dp      = $self->{DSNParser};
+   my $dp      = $self->DSNParser;
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   if ( grep { m/processlist|hosts/i } @$methods ) {
+   if ( grep { m/^(?:processlist|hosts)$/i } @$methods ) {
       my @required_args = qw(dbh dsn);
       foreach my $arg ( @required_args ) {
          die "I need a $arg argument" unless $args{$arg};
@@ -3930,24 +4056,20 @@
 
 sub _resolve_recursion_methods {
    my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
+   if ( !$self->_explicit_recursion_method() && $dsn && ($dsn->{P} || 3306) != 3306 ) {
       PTDEBUG && _d('Port number is non-standard; using only hosts method');
       return [qw(hosts)];
    }
    else {
-      return $o->get('recursion-method');
+      return $self->recursion_method();
    }
 }
 
 sub recurse_to_slaves {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
-   my $dp      = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
+   my $dp      = $self->DSNParser;
+   my $recurse = $args->{recurse} || $self->recurse();
    my $dsn     = $args->{dsn};
 
    my $methods = $self->_resolve_recursion_methods($dsn);
@@ -3991,7 +4113,7 @@
 
       my @slaves =
          grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+         $self->find_slave_hosts($dbh, $dsn, $methods);
 
       foreach my $slave ( @slaves ) {
          PTDEBUG && _d('Recursing from',
@@ -4003,7 +4125,8 @@
 }
 
 sub find_slave_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
+   my ( $self, $dbh, $dsn, $methods ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
@@ -4013,7 +4136,7 @@
    foreach my $method ( @$methods ) {
       my $find_slaves = "_find_slaves_by_$method";
       PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
+      @slaves = $self->$find_slaves($dbh, $dsn);
       last METHOD if @slaves;
    }
 
@@ -4022,7 +4145,8 @@
 }
 
 sub _find_slaves_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves = map  {
       my $slave        = $dsn_parser->parse("h=$_", $dsn);
@@ -4042,7 +4166,8 @@
 }
 
 sub _find_slaves_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
 
    my @slaves;
    my $sql = 'SHOW SLAVE HOSTS';
@@ -4153,41 +4278,32 @@
 }
 
 sub get_master_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
-   return       $dsn_parser->parse($spec, $dsn);
+   my ( $self, $dbh, $dsn ) = @_;
+   my $dsn_parser = $self->DSNParser;
+   my $master     = $self->get_slave_status($dbh) or return undef;
+   my $spec       = "h=$master->{master_host},P=$master->{master_port}";
+   return $dsn_parser->parse($spec, $dsn);
 }
 
 sub get_slave_status {
    my ( $self, $dbh ) = @_;
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
-      $sth->execute();
-      my ($ss) = @{$sth->fetchall_arrayref({})};
-
-      if ( $ss && %$ss ) {
-         $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-         return $ss;
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+   my $sth = $dbh->prepare('SHOW SLAVE STATUS');
+   PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   $sth->execute();
+   my ($ss) = @{$sth->fetchall_arrayref({})};
+
+   if ( $ss && %$ss ) {
+      $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
+      return $ss;
    }
+
+   PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
 }
 
 sub get_master_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
-      return;
-   }
-
-   my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+   my $sth = $dbh->prepare('SHOW MASTER STATUS');
    PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
@@ -4197,7 +4313,6 @@
 
    if ( !$ms || scalar keys %$ms < 2 ) {
       PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
@@ -4238,8 +4353,7 @@
 
 sub stop_slave {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $sth = $dbh->prepare('STOP SLAVE');
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
@@ -4253,103 +4367,18 @@
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $dbh->prepare('START SLAVE');
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
-
-   my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
-
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
-            timeout       => $timeout,
-            master_status => $master_status
-      );
-      if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
-            }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
-         }
-         else {
-            die "Slave has not caught up to master and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Slave is already caught up to master");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub slave_is_running {
+sub _slave_is_running {
    my ( $self, $slave_status ) = @_;
    return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
-   my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
+sub _repl_posn {
    my ( $self, $status ) = @_;
    if ( exists $status->{file} && exists $status->{position} ) {
       return {
@@ -4372,89 +4401,10 @@
    return $stat->{seconds_behind_master};
 }
 
-sub pos_cmp {
+sub _pos_cmp {
    my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_; 
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
-         if ( $type ne 'all' ) { 
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($slave_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
-
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
+   return $self->_pos_to_string($a) cmp $self->_pos_to_string($b);
+}
 
 sub get_replication_filters {
    my ( $self, %args ) = @_;
@@ -4499,18 +4449,12 @@
 }
 
 
-sub pos_to_string {
+sub _pos_to_string {
    my ( $self, $pos ) = @_;
    my $fmt  = '%s/%020d';
    return sprintf($fmt, @{$pos}{qw(file position)});
 }
 
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
 sub get_cxn_from_dsn_table {
    my ($self, %args) = @_;
    my @required_args = qw(dsn_table_dsn make_cxn);
@@ -4520,8 +4464,8 @@
    my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
    PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
 
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
+   my $dp = $self->DSNParser;
+   my $q  = $self->Quoter;
 
    my $dsn = $dp->parse($dsn_table_dsn);
    my $dsn_table;

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2012-11-09 16:48:17 +0000
+++ bin/pt-query-digest	2012-11-14 08:53:21 +0000
@@ -42,7 +42,6 @@
       ProtocolParser
       HTTPProtocolParser
       ExecutionThrottler
-      MasterSlave
       Progress
       FileIterator
       ExplainAnalyzer
@@ -492,12 +491,18 @@
 
 sub split_unquote {
    my ( $self, $db_tbl, $default_db ) = @_;
-   $db_tbl =~ s/`//g;
    my ( $db, $tbl ) = split(/[.]/, $db_tbl);
    if ( !$tbl ) {
       $tbl = $db;
       $db  = $default_db;
    }
+   for ($db, $tbl) {
+      next unless $_;
+      s/\A`//;
+      s/`\z//;
+      s/``/`/g;
+   }
+   
    return ($db, $tbl);
 }
 
@@ -2373,7 +2378,7 @@
 
 sub new {
    my ( $class, %args ) = @_;
-   foreach my $arg ( qw(MasterSlave) ) {
+   foreach my $arg ( qw() ) {
       die "I need a $arg argument" unless $args{$arg};
    }
    my $self = {
@@ -2573,7 +2578,6 @@
 sub find {
    my ( $self, $proclist, %find_spec ) = @_;
    PTDEBUG && _d('find specs:', Dumper(\%find_spec));
-   my $ms  = $self->{MasterSlave};
 
    my @matches;
    QUERY:
@@ -2582,7 +2586,7 @@
       my $matched = 0;
 
       if (    !$find_spec{replication_threads}
-           && $ms->is_replication_thread($query) ) {
+           && $self->is_replication_thread($query) ) {
          PTDEBUG && _d('Skipping replication thread');
          next QUERY;
       }
@@ -2682,6 +2686,75 @@
       && $query->{Info} =~ m/$property/;
 }
 
+sub is_replication_thread {
+   my ( $self, $query, %args ) = @_; 
+   return unless $query;
+
+   my $type = lc($args{type} || 'all');
+   die "Invalid type: $type"
+      unless $type =~ m/^(?:binlog_dump|slave_io|slave_sql|all)$/i;
+
+   my $match = 0;
+   if ( $type =~ m/binlog_dump|all/i ) {
+      $match = 1
+         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
+   }
+   if ( !$match ) {
+      if ( lc($query->{User} || $query->{user} || '') eq "system user" ) {
+         PTDEBUG && _d("Slave replication thread");
+         if ( $type ne 'all' ) { 
+            my $state = $query->{State} || $query->{state} || '';
+
+            if ( $state =~ m/^(?:init|end)$/ ) {
+               PTDEBUG && _d("Special state:", $state);
+               $match = 1;
+            }
+            else {
+               my ($slave_sql) = $state =~ m/
+                  ^(Waiting\sfor\sthe\snext\sevent
+                   |Reading\sevent\sfrom\sthe\srelay\slog
+                   |Has\sread\sall\srelay\slog;\swaiting
+                   |Making\stemp\sfile
+                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
+
+               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
+                      : $type eq 'slave_io'  && !$slave_sql ? 1
+                      :                                       0;
+            }
+         }
+         else {
+            $match = 1;
+         }
+      }
+      else {
+         PTDEBUG && _d('Not system user');
+      }
+
+      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
+         my $id = $query->{Id} || $query->{id};
+         if ( $match ) {
+            $self->{_replication_thread}->{$id} = 1;
+         }
+         else {
+            if ( $self->{_replication_thread}->{$id} ) {
+               PTDEBUG && _d("Thread ID is a known replication thread ID");
+               $match = 1;
+            }
+         }
+      }
+   }
+
+   PTDEBUG && _d('Matches', $type, 'replication thread:',
+      ($match ? 'yes' : 'no'), '; match:', $match);
+
+   return $match;
+}
+
+sub reset_known_replication_threads {
+   my ($self) = @_;
+   $self->{_replication_thread} = {};
+}
+
 sub _d {
    my ($package, undef, $line) = caller 0;
    @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
@@ -8103,16 +8176,20 @@
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
    my $self = { %args };
+   $self->{Quoter} ||= Quoter->new();
    return bless $self, $class;
 }
 
+sub Quoter { shift->{Quoter} }
+
 sub get_create_table {
    my ( $self, $dbh, $db, $tbl ) = @_;
    die "I need a dbh parameter" unless $dbh;
@@ -10462,740 +10539,6 @@
 # ###########################################################################
 
 # ###########################################################################
-# MasterSlave 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/MasterSlave.pm
-#   t/lib/MasterSlave.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-package MasterSlave;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub check_recursion_method {
-   my ($methods) = @_;
-
-   if ( @$methods != 1 ) {
-      if ( grep({ !m/processlist|hosts/i } @$methods)
-            && $methods->[0] !~ /^dsn=/i )
-      {
-         die  "Invalid combination of recursion methods: "
-            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
-            . "Only hosts and processlist may be combined.\n"
-      }
-   }
-   else {
-      my ($method) = @$methods;
-      die "Invalid recursion method: " . ( $method || 'undef' )
-         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|dsn=)/i;
-   }
-}
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
-sub get_slaves {
-   my ($self, %args) = @_;
-   my @required_args = qw(make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($make_cxn) = @args{@required_args};
-
-   my $slaves  = [];
-   my $dp      = $self->{DSNParser};
-   my $methods = $self->_resolve_recursion_methods($args{dsn});
-
-   if ( grep { m/processlist|hosts/i } @$methods ) {
-      my @required_args = qw(dbh dsn);
-      foreach my $arg ( @required_args ) {
-         die "I need a $arg argument" unless $args{$arg};
-      }
-      my ($dbh, $dsn) = @args{@required_args};
-      
-      $self->recurse_to_slaves(
-         {  dbh       => $dbh,
-            dsn       => $dsn,
-            callback  => sub {
-               my ( $dsn, $dbh, $level, $parent ) = @_;
-               return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               push @$slaves, $make_cxn->(dsn => $dsn, dbh => $dbh);
-               return;
-            },
-         }
-      );
-   }
-   elsif ( $methods->[0] =~ m/^dsn=/i ) {
-      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
-         %args,
-         dsn_table_dsn => $dsn_table_dsn,
-      );
-   }
-   elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
-   }
-   else {
-      die "Unexpected recursion methods: @$methods";
-   }
-   
-   return $slaves;
-}
-
-sub _resolve_recursion_methods {
-   my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
-      PTDEBUG && _d('Port number is non-standard; using only hosts method');
-      return [qw(hosts)];
-   }
-   else {
-      return $o->get('recursion-method');
-   }
-}
-
-sub recurse_to_slaves {
-   my ( $self, $args, $level ) = @_;
-   $level ||= 0;
-   my $dp      = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
-   my $dsn     = $args->{dsn};
-
-   my $methods = $self->_resolve_recursion_methods($dsn);
-   PTDEBUG && _d('Recursion methods:', @$methods);
-   if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
-      return;
-   }
-
-   my $dbh;
-   eval {
-      $dbh = $args->{dbh} || $dp->get_dbh(
-         $dp->get_cxn_params($dsn), { AutoCommit => 1 });
-      PTDEBUG && _d('Connected to', $dp->as_string($dsn));
-   };
-   if ( $EVAL_ERROR ) {
-      print STDERR "Cannot connect to ", $dp->as_string($dsn), "\n"
-         or die "Cannot print: $OS_ERROR";
-      return;
-   }
-
-   my $sql  = 'SELECT @@SERVER_ID';
-   PTDEBUG && _d($sql);
-   my ($id) = $dbh->selectrow_array($sql);
-   PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
-   if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
-       || $args->{server_ids_seen}->{$id}++
-   ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
-      if ( $args->{skip_callback} ) {
-         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
-      }
-      return;
-   }
-
-   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
-
-   if ( !defined $recurse || $level < $recurse ) {
-
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
-
-      foreach my $slave ( @slaves ) {
-         PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn }, $level + 1 );
-      }
-   }
-}
-
-sub find_slave_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
-
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
-      'using methods', @$methods);
-
-   my @slaves;
-   METHOD:
-   foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
-   }
-
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
-}
-
-sub _find_slaves_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
-   }
-   grep { $_ }
-   map  {
-      my ( $host ) = $_->{host} =~ m/^([^:]+):/;
-      if ( $host eq 'localhost' ) {
-         $host = '127.0.0.1'; # Replication never uses sockets.
-      }
-      $host;
-   } $self->get_connected_slaves($dbh);
-
-   return @slaves;
-}
-
-sub _find_slaves_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
-   PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         my $spec = "h=$hash{host},P=$hash{port}"
-            . ( $hash{user} ? ",u=$hash{user}" : '')
-            . ( $hash{password} ? ",p=$hash{password}" : '');
-         my $dsn           = $dsn_parser->parse($spec, $dsn);
-         $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
-         $dsn->{source}    = 'hosts';
-         $dsn;
-      } @slaves;
-   }
-
-   return @slaves;
-}
-
-sub get_connected_slaves {
-   my ( $self, $dbh ) = @_;
-
-   my $show = "SHOW GRANTS FOR ";
-   my $user = 'CURRENT_USER()';
-   my $sql = $show . $user;
-   PTDEBUG && _d($dbh, $sql);
-
-   my $proc;
-   eval {
-      $proc = grep {
-         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-      } @{$dbh->selectcol_arrayref($sql)};
-   };
-   if ( $EVAL_ERROR ) {
-
-      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
-         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
-            $EVAL_ERROR);
-         ($user) = split('@', $user);
-         $sql    = $show . $user;
-         PTDEBUG && _d($sql);
-         eval {
-            $proc = grep {
-               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-            } @{$dbh->selectcol_arrayref($sql)};
-         };
-      }
-
-      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
-   }
-   if ( !$proc ) {
-      die "You do not have the PROCESS privilege";
-   }
-
-   $sql = 'SHOW PROCESSLIST';
-   PTDEBUG && _d($dbh, $sql);
-   grep { $_->{command} =~ m/Binlog Dump/i }
-   map  { # Lowercase the column names
-      my %hash;
-      @hash{ map { lc $_ } keys %$_ } = values %$_;
-      \%hash;
-   }
-   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-}
-
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
-
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
-   }
-
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
-   }
-
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
-   {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
-      {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
-      }
-   }
-   return 1;
-}
-
-sub get_master_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
-   return       $dsn_parser->parse($spec, $dsn);
-}
-
-sub get_slave_status {
-   my ( $self, $dbh ) = @_;
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
-      $sth->execute();
-      my ($ss) = @{$sth->fetchall_arrayref({})};
-
-      if ( $ss && %$ss ) {
-         $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-         return $ss;
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
-   }
-}
-
-sub get_master_status {
-   my ( $self, $dbh ) = @_;
-
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
-      return;
-   }
-
-   my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
-   $sth->execute();
-   my ($ms) = @{$sth->fetchall_arrayref({})};
-   PTDEBUG && _d(
-      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
-          : '');
-
-   if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
-   }
-
-  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
-}
-
-sub wait_for_master {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($master_status, $slave_dbh) = @args{@required_args};
-   my $timeout       = $args{timeout} || 60;
-
-   my $result;
-   my $waited;
-   if ( $master_status ) {
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', "
-              . "$master_status->{position}, $timeout)";
-      PTDEBUG && _d($slave_dbh, $sql);
-      my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
-
-      $waited = time - $start;
-
-      PTDEBUG && _d('Result of waiting:', $result);
-      PTDEBUG && _d("Waited", $waited, "seconds");
-   }
-   else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
-   }
-
-   return {
-      result => $result,
-      waited => $waited,
-   };
-}
-
-sub stop_slave {
-   my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
-   PTDEBUG && _d($dbh, $sth->{Statement});
-   $sth->execute();
-}
-
-sub start_slave {
-   my ( $self, $dbh, $pos ) = @_;
-   if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
-      PTDEBUG && _d($dbh, $sql);
-      $dbh->do($sql);
-   }
-   else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
-      PTDEBUG && _d($dbh, $sth->{Statement});
-      $sth->execute();
-   }
-}
-
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
-
-   my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
-
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
-            timeout       => $timeout,
-            master_status => $master_status
-      );
-      if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
-            }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
-         }
-         else {
-            die "Slave has not caught up to master and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Slave is already caught up to master");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
-}
-
-sub has_slave_updates {
-   my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
-   my ( $self, $status ) = @_;
-   if ( exists $status->{file} && exists $status->{position} ) {
-      return {
-         file     => $status->{file},
-         position => $status->{position},
-      };
-   }
-   else {
-      return {
-         file     => $status->{relay_master_log_file},
-         position => $status->{exec_master_log_pos},
-      };
-   }
-}
-
-sub get_slave_lag {
-   my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
-}
-
-sub pos_cmp {
-   my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_; 
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
-         if ( $type ne 'all' ) { 
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($slave_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi; 
-
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
-
-sub get_replication_filters {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dbh) = @args{@required_args};
-
-   my %filters = ();
-
-   my $status = $self->get_master_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         binlog_do_db
-         binlog_ignore_db
-      );
-   }
-
-   $status = $self->get_slave_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         replicate_do_db
-         replicate_ignore_db
-         replicate_do_table
-         replicate_ignore_table 
-         replicate_wild_do_table
-         replicate_wild_ignore_table
-      );
-
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
-      PTDEBUG && _d($dbh, $sql);
-      my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
-   }
-
-   return \%filters; 
-}
-
-
-sub pos_to_string {
-   my ( $self, $pos ) = @_;
-   my $fmt  = '%s/%020d';
-   return sprintf($fmt, @{$pos}{qw(file position)});
-}
-
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
-sub get_cxn_from_dsn_table {
-   my ($self, %args) = @_;
-   my @required_args = qw(dsn_table_dsn make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
-   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
-
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
-
-   my $dsn = $dp->parse($dsn_table_dsn);
-   my $dsn_table;
-   if ( $dsn->{D} && $dsn->{t} ) {
-      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
-   }
-   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
-      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
-   }
-   else {
-      die "DSN table DSN does not specify a database (D) "
-        . "or a database-qualified table (t)";
-   }
-
-   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
-   my $dbh         = $dsn_tbl_cxn->connect();
-   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
-   PTDEBUG && _d($sql);
-   my $dsn_strings = $dbh->selectcol_arrayref($sql);
-   my @cxn;
-   if ( $dsn_strings ) {
-      foreach my $dsn_string ( @$dsn_strings ) {
-         PTDEBUG && _d('DSN from DSN table:', $dsn_string);
-         push @cxn, $make_cxn->(dsn_string => $dsn_string);
-      }
-   }
-   return \@cxn;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End MasterSlave package
-# ###########################################################################
-
-# ###########################################################################
 # Progress 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,
@@ -13674,14 +13017,8 @@
    { # event
       my $misc;
       if ( $ps_dsn = $o->get('processlist') ) {
-         my $ms = new MasterSlave(
-            OptionParser => $o,
-            DSNParser    => $dp,
-            Quoter       => $q,
-         );
          my $pl = new Processlist(
-            interval    => $o->get('interval') * 1_000_000,
-            MasterSlave => $ms
+            interval    => $o->get('interval') * 1_000_000
          );
          my ( $sth, $cxn );
          my $cur_server = 'processlist';

=== modified file 'bin/pt-slave-find'
--- bin/pt-slave-find	2012-11-09 16:31:13 +0000
+++ bin/pt-slave-find	2012-11-14 08:53:21 +0000
@@ -15,7 +15,9 @@
    $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
       OptionParser
       Mo
+      Percona::Object
       DSNParser
+      Cxn
       MasterSlave
       Daemon
       VersionParser
@@ -1114,7 +1116,6 @@
             push @args_to_delete, $attr;
          }
       }
-
       delete $args->{$_} for @args_to_delete;
 
       for my $attribute ( keys %$args ) {
@@ -1159,6 +1160,43 @@
       }
       return $ref;
    }
+
+   sub meta {
+      my $class = shift;
+      return Mo::Meta::Class->new(class => $class);
+   }
+}
+
+{
+   package Mo::Meta::Class;
+
+   sub new {
+      my $class = shift;
+      return bless { @_ }, $class
+   }
+
+   sub class { shift->{class} }
+
+   sub attributes {
+      my $self = shift;
+      return keys %{$metadata_for{$self->class}}
+   }
+
+   sub attributes_for_new {
+      my $self = shift;
+      my @attributes;
+
+      while ( my ($attr, $meta) = each %{$metadata_for{$self->class}} ) {
+         if ( exists $meta->{init_arg} ) {
+            push @attributes, $meta->{init_arg}
+                  if defined $meta->{init_arg};
+         }
+         else {
+            push @attributes, $attr;
+         }
+      }
+      return @attributes;
+   }
 }
 
 my %export_for;
@@ -1318,16 +1356,17 @@
 
 sub _check_type_constaints {
    my ($attribute, $I, $I_name, $val) = @_;
+   local $@;
    ( ref($I) eq 'CODE'
-      ? $I->($val)
+      ? eval { $I->($val) }
       : (ref $val eq $I
          || ($val && $val eq $I)
          || (exists $TYPES{$I} && $TYPES{$I}->($val)))
    )
    || Carp::confess(
-         qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$I_name' with value >
-      . (defined $val ? Mo::Dumper($val) : 'undef') )
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . ( $@ || ( qq<Validation failed for '$I_name' with value >
+      .           defined $val ? Mo::Dumper($val) : 'undef') ) )
 }
 
 sub _has_handles {
@@ -1500,6 +1539,52 @@
 # ###########################################################################
 
 # ###########################################################################
+# Percona::Object 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/Percona/Object.pm
+#   t/lib/Percona/Object.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Percona::Object;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Mo;
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+
+   return $args unless $args->{OptionParser};
+
+   my $o          = $args->{OptionParser};
+   my @attributes = $self->meta->attributes_for_new();
+
+   foreach my $attr ( @attributes ) {
+      next if exists $args->{$attr};
+      (my $attr_for_o = $attr) =~ tr/_/-/;
+      if ( $o->has($attr_for_o) ) {
+         $args->{$attr} = $o->get($attr_for_o)
+      } elsif ( $attr eq 'DSNParser' ) {
+         $args->{DSNParser} = $o->DSNParser;
+      }
+   }
+
+   return $args;
+}
+
+1;
+}
+# ###########################################################################
+# End Percona::Object package
+# ###########################################################################
+
+# ###########################################################################
 # DSNParser 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,
@@ -1877,6 +1962,165 @@
 # ###########################################################################
 
 # ###########################################################################
+# Cxn 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/Cxn.pm
+#   t/lib/Cxn.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Cxn;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Scalar::Util qw(blessed);
+use constant {
+   PTDEBUG => $ENV{PTDEBUG} || 0,
+   PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
+};
+
+sub new {
+   my ( $class, %args ) = @_;
+   my @required_args = qw(DSNParser OptionParser);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my ($dp, $o) = @args{@required_args};
+
+   my $dsn_defaults = $dp->parse_options($o);
+   my $prev_dsn     = $args{prev_dsn};
+   my $dsn          = $args{dsn};
+   if ( !$dsn ) {
+      $args{dsn_string} ||= 'h=' . ($dsn_defaults->{h} || 'localhost');
+
+      $dsn = $dp->parse(
+         $args{dsn_string}, $prev_dsn, $dsn_defaults);
+   }
+   elsif ( $prev_dsn ) {
+      $dsn = $dp->copy($prev_dsn, $dsn);
+   }
+
+   my $self = {
+      dsn          => $dsn,
+      dbh          => $args{dbh},
+      dsn_name     => $dp->as_string($dsn, [qw(h P S)]),
+      hostname     => '',
+      set          => $args{set},
+      NAME_lc      => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
+      dbh_set      => 0,
+      OptionParser => $o,
+      DSNParser    => $dp,
+      short_host   => $args{short_host},
+   };
+
+   return bless $self, $class;
+}
+
+sub connect {
+   my ( $self ) = @_;
+   my $dsn = $self->{dsn};
+   my $dp  = $self->{DSNParser};
+   my $o   = $self->{OptionParser};
+
+   my $dbh = $self->{dbh};
+   if ( !$dbh || !$dbh->ping() ) {
+      if ( $o->get('ask-pass') && !$self->{asked_for_pass} ) {
+         $dsn->{p} = OptionParser::prompt_noecho("Enter MySQL password: ");
+         $self->{asked_for_pass} = 1;
+      }
+      $dbh = $dp->get_dbh($dp->get_cxn_params($dsn),  { AutoCommit => 1 });
+   }
+   PTDEBUG && _d($dbh, 'Connected dbh to', $self->{name});
+
+   return $self->set_dbh($dbh);
+}
+
+sub set_dbh {
+   my ($self, $dbh) = @_;
+
+   if ( $self->{dbh} && $self->{dbh} == $dbh && $self->{dbh_set} ) {
+      PTDEBUG && _d($dbh, 'Already set dbh');
+      return $dbh;
+   }
+
+   PTDEBUG && _d($dbh, 'Setting dbh');
+
+   $dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
+
+   my $sql = 'SELECT @@hostname, @@server_id';
+   PTDEBUG && _d($dbh, $sql);
+   my ($hostname, $server_id) = $dbh->selectrow_array($sql);
+   PTDEBUG && _d($dbh, 'hostname:', $hostname, $server_id);
+   if ( $hostname ) {
+      $self->{hostname} = $hostname;
+   }
+
+   if ( my $set = $self->{set}) {
+      $set->($dbh);
+   }
+
+   $self->{dbh}     = $dbh;
+   $self->{dbh_set} = 1;
+   return $dbh;
+}
+
+sub dbh {
+   my ($self) = @_;
+   return $self->{dbh};
+}
+
+sub dsn {
+   my ($self) = @_;
+   return $self->{dsn};
+}
+
+sub name {
+   my ($self) = @_;
+   if ( $self->{short_host} ) {
+      my $dsn = $self->{dsn};
+      my ($host, $port);
+      if ( my $ss = $_[1] ) {
+         $host = $ss->{master_host};
+         $port = $ss->{master_port};
+      }
+      else {
+         $host = $dsn->{h};
+         $port = $dsn->{P};
+      }
+      return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
+   }
+   return $self->{dsn_name} if PERCONA_TOOLKIT_TEST_USE_DSN_NAMES;
+   return $self->{hostname} || $self->{dsn_name} || 'unknown host';
+}
+
+sub DESTROY {
+   my ($self) = @_;
+   if ( $self->{dbh}
+         && blessed($self->{dbh})
+         && $self->{dbh}->can("disconnect") ) {
+      PTDEBUG && _d('Disconnecting dbh', $self->{dbh}, $self->{name});
+      $self->{dbh}->disconnect();
+   }
+   return;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Cxn package
+# ###########################################################################
+
+# ###########################################################################
 # MasterSlave 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,
@@ -1892,6 +2136,61 @@
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
+use Mo;
+
+extends qw( Percona::Object );
+
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
+has Quoter => (
+   is      => 'ro',
+   isa     => 'Quoter',
+   default => sub { Quoter->new() },
+);
+
+has DSNParser => (
+   is       => 'ro',
+   isa      => 'DSNParser',
+   required => 1,
+);
+
+has recursion_method => (
+   is       => 'ro',
+   isa      => sub {
+      die "recursion_method should be an arrayref, not " . ($_[0] || 'undef')
+         unless ref($_[0]) eq 'ARRAY';
+      check_recursion_method($_[0]);
+      return 1;
+   },
+   required => 1,
+);
+
+has _explicit_recursion_method => (
+   is      => 'ro',
+   isa     => 'Bool',
+   default => sub { 1 },
+);
+
+has recurse => (
+   is       => 'ro',
+   isa      => 'Maybe[Int]',
+   required => 1,
+);
+
+sub BUILDARGS {
+   my $self = shift;
+   my $args = $self->SUPER::BUILDARGS(@_);
+   my $o    = delete $args->{OptionParser};
+
+   $args->{_explicit_recursion_method} = $o->got('recursion-method')
+      if $o;
+
+   return $args;
+}
+
 sub check_recursion_method {
    my ($methods) = @_;
 
@@ -1911,19 +2210,6 @@
    }
 }
 
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,