Merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.12 into lp:percona-toolkit/2.2

[Tomislav Plavcic]

Release branch for version 2.2.12

=== modified file 'Changelog'
--- Changelog	2014-09-25 13:48:22 +0000
+++ Changelog	2014-11-14 14:12:25 +0000
@@ -1,5 +1,17 @@
 Changelog for Percona Toolkit
 
+v2.2.12 released 2014-11-14
+
+
+  * Fixed bug 1376561:	pt-archiver is not able to archive all the rows when a table has a hash partition
+  * Fixed bug 1328686:	pt-heartbeat check-read-only option does not prevent creates or inserts
+  * Fixed bug 1269695:	pt-online-schema-change does not allow ALTER for a table without a non-unique, while manual does not explain this
+  * Fixed bug 1217466:	pt-table-checksum refuses to run on PXC if server_id is the same on all nodes
+  * Fixed bug 1373937:	pt-table-checksum requires recursion when working with and XtraDB Cluster node
+  * Fixed bug 1377888:	pt-query-digest manual for --type binlog is ambiguous
+  * Fixed bug 1349086:	pt-stalk should also gather dmesg output 
+  * Fixed bug 1361293:	Some scripts fail when no-version-check option is put in global config file
+
 v2.2.11 released 2014-09-26
 
   * Fixed bug 1262456: pt-query-digest doesn't report host details
 
=== modified file 'Makefile.PL'
--- Makefile.PL	2014-09-25 13:48:22 +0000
+++ Makefile.PL	2014-11-14 14:12:25 +0000
@@ -2,7 +2,7 @@
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '2.2.11',
+    VERSION   => '2.2.12',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
 
=== modified file 'bin/pt-align'
--- bin/pt-align	2014-09-25 13:48:22 +0000
+++ bin/pt-align	2014-11-14 14:12:25 +0000
@@ -901,6 +901,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -1323,6 +1331,6 @@
 
 =head1 VERSION
 
-pt-align 2.2.11
+pt-align 2.2.12
 
 =cut
 
=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2014-09-25 13:48:22 +0000
+++ bin/pt-archiver	2014-11-14 14:12:25 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5811,7 +5811,18 @@
       $next_sql .= " AND $sel_stmt->{where}";
    }
 
+   # Obtain index cols so we can order them when ascending 
+   # this ensures returned sets are disjoint when ran on partitioned tables
+   # issue 1376561
+   my $index_cols;
+   if (  $sel_stmt->{index} 
+         && $src->{info}->{keys}->{$sel_stmt->{index}}->{cols} 
+   ) {
+      $index_cols = $src->{info}->{keys}->{$sel_stmt->{index}}->{colnames};
+   }
+
    foreach my $thing ( $first_sql, $next_sql ) {
+      $thing .= " ORDER BY $index_cols" if $index_cols; 
       $thing .= " LIMIT $limit";
       if ( $o->get('for-update') ) {
          $thing .= ' FOR UPDATE';
@@ -7892,6 +7903,6 @@
 
 =head1 VERSION
 
-pt-archiver 2.2.11
+pt-archiver 2.2.12
 
 =cut
 
=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2014-09-25 13:48:22 +0000
+++ bin/pt-config-diff	2014-11-14 14:12:25 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2295,7 +2295,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -2306,7 +2306,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -2325,6 +2325,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -2386,6 +2393,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -2395,7 +2413,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -5733,6 +5752,6 @@
 
 =head1 VERSION
 
-pt-config-diff 2.2.11
+pt-config-diff 2.2.12
 
 =cut
 
=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2014-09-25 13:48:22 +0000
+++ bin/pt-deadlock-logger	2014-11-14 14:12:25 +0000
@@ -42,7 +42,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2639,7 +2639,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -2650,7 +2650,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -2669,6 +2669,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -2730,6 +2737,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -2739,7 +2757,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -5523,6 +5542,6 @@
 
 =head1 VERSION
 
-pt-deadlock-logger 2.2.11
+pt-deadlock-logger 2.2.12
 
 =cut
 
=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2014-09-25 13:48:22 +0000
+++ bin/pt-diskstats	2014-11-14 14:12:25 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5579,6 +5579,6 @@
 
 =head1 VERSION
 
-pt-diskstats 2.2.11
+pt-diskstats 2.2.12
 
 =cut
 
=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2014-09-25 13:48:22 +0000
+++ bin/pt-duplicate-key-checker	2014-11-14 14:12:25 +0000
@@ -39,7 +39,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5600,6 +5600,6 @@
 
 =head1 VERSION
 
-pt-duplicate-key-checker 2.2.11
+pt-duplicate-key-checker 2.2.12
 
 =cut
 
=== modified file 'bin/pt-fifo-split'
--- bin/pt-fifo-split	2014-09-25 13:48:22 +0000
+++ bin/pt-fifo-split	2014-11-14 14:12:25 +0000
@@ -902,6 +902,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -1612,6 +1620,6 @@
 
 =head1 VERSION
 
-pt-fifo-split 2.2.11
+pt-fifo-split 2.2.12
 
 =cut
 
=== modified file 'bin/pt-find'
--- bin/pt-find	2014-09-25 13:48:22 +0000
+++ bin/pt-find	2014-11-14 14:12:25 +0000
@@ -35,7 +35,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4984,6 +4984,6 @@
 
 =head1 VERSION
 
-pt-find 2.2.11
+pt-find 2.2.12
 
 =cut
 
=== modified file 'bin/pt-fingerprint'
--- bin/pt-fingerprint	2014-09-25 13:48:22 +0000
+++ bin/pt-fingerprint	2014-11-14 14:12:25 +0000
@@ -903,6 +903,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -2203,6 +2211,6 @@
 
 =head1 VERSION
 
-pt-fingerprint 2.2.11
+pt-fingerprint 2.2.12
 
 =cut
 
=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger	2014-09-25 13:48:22 +0000
+++ bin/pt-fk-error-logger	2014-11-14 14:12:25 +0000
@@ -37,7 +37,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -1791,7 +1791,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -1802,7 +1802,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -1821,6 +1821,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -1882,6 +1889,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -1891,7 +1909,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -4509,6 +4528,6 @@
 
 =head1 VERSION
 
-pt-fk-error-logger 2.2.11
+pt-fk-error-logger 2.2.12
 
 =cut
 
=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2014-09-25 13:48:22 +0000
+++ bin/pt-heartbeat	2014-11-14 14:12:25 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4892,6 +4892,32 @@
    $dbh->do("USE `$db`");
 
    # ########################################################################
+   # If --check-read-only option was given and we are in --update mode 
+   # we wait until server is writable , or run-time is over, or sentinel file
+   # We also do this check after daemon is up and running, but it is necessary 
+   # to check this before attempting to create the table and inserting rows
+   # https://bugs.launchpad.net/percona-toolkit/+bug/1328686
+   # #######################################################################
+   if ( $o->get('check-read-only') && $o->get('update') ) {
+      PTDEBUG && _d('Checking if server is read_only');
+      if ( server_is_readonly($dbh) &&  PTDEBUG ) {
+         _d('Server is read-only, waiting')
+      }
+      my $start_time = time;
+      my $run_time   = $o->get('run-time');
+      my $interval   = $o->get('interval') || 5;
+      while (server_is_readonly($dbh)) {
+         sleep($interval); 
+         if ( 
+            ($run_time && $run_time < time - $start_time)
+            || -f $sentinel
+         ) {
+            return 0;
+         }
+      }
+   }
+
+   # ########################################################################
    # Create the heartbeat table if --create-table was given.
    # ########################################################################
    my $utc       = $o->get('utc');
@@ -6192,6 +6218,6 @@
 
 =head1 VERSION
 
-pt-heartbeat 2.2.11
+pt-heartbeat 2.2.12
 
 =cut
 
=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2014-09-25 13:48:22 +0000
+++ bin/pt-index-usage	2014-11-14 14:12:25 +0000
@@ -45,7 +45,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -7548,6 +7548,6 @@
 
 =head1 VERSION
 
-pt-index-usage 2.2.11
+pt-index-usage 2.2.12
 
 =cut
 
=== modified file 'bin/pt-ioprofile'
--- bin/pt-ioprofile	2014-09-25 13:48:22 +0000
+++ bin/pt-ioprofile	2014-11-14 14:12:25 +0000
@@ -86,9 +86,10 @@
 
 usage_or_errors() {
    local file="$1"
+   local version=""
 
    if [ "$OPT_VERSION" ]; then
-      local version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
+      version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
       echo "$version"
       return 1
    fi
@@ -310,6 +311,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -1119,7 +1122,7 @@
 
 =head1 VERSION
 
-pt-ioprofile 2.2.11
+pt-ioprofile 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-kill'
--- bin/pt-kill	2014-09-25 13:48:22 +0000
+++ bin/pt-kill	2014-11-14 14:12:25 +0000
@@ -47,7 +47,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5158,7 +5158,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -5169,7 +5169,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -5188,6 +5188,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -5249,6 +5256,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -5258,7 +5276,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -8183,6 +8202,6 @@
 
 =head1 VERSION
 
-pt-kill 2.2.11
+pt-kill 2.2.12
 
 =cut
 
=== modified file 'bin/pt-mext'
--- bin/pt-mext	2014-09-25 13:48:22 +0000
+++ bin/pt-mext	2014-11-14 14:12:25 +0000
@@ -251,34 +251,38 @@
 _parse_pod() {
    local file="$1"
 
-   cat "$file" | PO_DIR="$PO_DIR" perl -ne '
-      BEGIN { $/ = ""; }
-      next unless $_ =~ m/^=head1 OPTIONS/;
-      while ( defined(my $para = <>) ) {
-         last if $para =~ m/^=head1/;
-         chomp;
-         if ( $para =~ m/^=item --(\S+)/ ) {
-            my $opt  = $1;
-            my $file = "$ENV{PO_DIR}/$opt";
-            open my $opt_fh, ">", $file or die "Cannot open $file: $!";
-            print $opt_fh "long:$opt\n";
-            $para = <>;
+   PO_FILE="$file" PO_DIR="$PO_DIR" perl -e '
+      $/ = "";
+      my $file = $ENV{PO_FILE};
+      open my $fh, "<", $file or die "Cannot open $file: $!";
+      while ( defined(my $para = <$fh>) ) {
+         next unless $para =~ m/^=head1 OPTIONS/;
+         while ( defined(my $para = <$fh>) ) {
+            last if $para =~ m/^=head1/;
             chomp;
-            if ( $para =~ m/^[a-z ]+:/ ) {
-               map {
+            if ( $para =~ m/^=item --(\S+)/ ) {
+               my $opt  = $1;
+               my $file = "$ENV{PO_DIR}/$opt";
+               open my $opt_fh, ">", $file or die "Cannot open $file: $!";
+               print $opt_fh "long:$opt\n";
+               $para = <$fh>;
+               chomp;
+               if ( $para =~ m/^[a-z ]+:/ ) {
+                  map {
+                     chomp;
+                     my ($attrib, $val) = split(/: /, $_);
+                     print $opt_fh "$attrib:$val\n";
+                  } split(/; /, $para);
+                  $para = <$fh>;
                   chomp;
-                  my ($attrib, $val) = split(/: /, $_);
-                  print $opt_fh "$attrib:$val\n";
-               } split(/; /, $para);
-               $para = <>;
-               chomp;
+               }
+               my ($desc) = $para =~ m/^([^?.]+)/;
+               print $opt_fh "desc:$desc.\n";
+               close $opt_fh;
             }
-            my ($desc) = $para =~ m/^([^?.]+)/;
-            print $opt_fh "desc:$desc.\n";
-            close $opt_fh;
          }
+         last;
       }
-      last;
    '
 }
 
@@ -348,6 +352,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -792,7 +798,7 @@
 
 =head1 VERSION
 
-pt-mext 2.2.11
+pt-mext 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2014-09-25 13:48:22 +0000
+++ bin/pt-mysql-summary	2014-11-14 14:12:25 +0000
@@ -313,6 +313,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -3083,7 +3085,7 @@
 
 =head1 VERSION
 
-pt-mysql-summary 2.2.11
+pt-mysql-summary 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2014-09-25 13:48:22 +0000
+++ bin/pt-online-schema-change	2014-11-14 14:12:25 +0000
@@ -54,7 +54,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3755,7 +3755,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -3766,12 +3766,12 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
    if ( !$dbh || !$dbh->ping() ) {
-      if ( $self->{ask_pass} && !$self->{asked_for_pass} && !defined $dsn->{p}) {
+      if ( $self->{ask_pass} && !$self->{asked_for_pass} ) {
          $dsn->{p} = OptionParser::prompt_noecho("Enter MySQL password: ");
          $self->{asked_for_pass} = 1;
       }
@@ -3785,6 +3785,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -3846,6 +3853,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -3855,7 +3873,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -7638,8 +7657,26 @@
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
-   my $seen_ids = $args{seen_ids};
-   return Cxn->remove_duplicate_cxns(%args);
+   my $seen_ids = $args{seen_ids} || {};
+   PTDEBUG && _d("Removing duplicates nodes from ", join(" ", map { $_->name } @cxns));
+   my @trimmed_cxns;
+
+   for my $cxn ( @cxns ) {
+      my $dbh  = $cxn->dbh();
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
+      PTDEBUG && _d($sql);
+      my ($id) = $dbh->selectrow_array($sql);
+      PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
+
+      if ( ! $seen_ids->{$id}++ ) {
+         push @trimmed_cxns, $cxn
+      }
+      else {
+         PTDEBUG && _d("Removing ", $cxn->name,
+                       ", ID ", $id, ", because we've already seen it");
+      }
+   }
+   return \@trimmed_cxns;
 }
 
 sub same_cluster {
@@ -10556,6 +10593,12 @@
 
 =item *
 
+In most cases the tool will refuse to operate unless a PRIMARY KEY or UNIQUE INDEX is 
+present in the table. See L<"--alter"> for details.
+
+
+=item *
+
 The tool refuses to operate if it detects replication filters. See
 L<"--[no]check-replication-filters"> for details.
 
@@ -10634,6 +10677,16 @@
 
 =item *
 
+In almost all cases a PRIMARY KEY or UNIQUE INDEX needs to be present in the table. 
+This is necessary because the tool creates a DELETE trigger to keep the new table 
+updated while the process is running.
+
+A notable exception is when a PRIMARY KEY or UNIQUE INDEX is being created from 
+B<existing columns> as part of the ALTER clause; in that case it will use these 
+column(s) for the DELETE trigger.
+
+=item *
+
 The C<RENAME> clause cannot be used to rename the table.
 
 =item *
@@ -11563,6 +11616,6 @@
 
 =head1 VERSION
 
-pt-online-schema-change 2.2.11
+pt-online-schema-change 2.2.12
 
 =cut
 
=== modified file 'bin/pt-pmp'
--- bin/pt-pmp	2014-09-25 13:48:22 +0000
+++ bin/pt-pmp	2014-11-14 14:12:25 +0000
@@ -129,9 +129,10 @@
 
 usage_or_errors() {
    local file="$1"
+   local version=""
 
    if [ "$OPT_VERSION" ]; then
-      local version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
+      version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
       echo "$version"
       return 1
    fi
@@ -353,6 +354,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -889,7 +892,7 @@
 
 =head1 VERSION
 
-pt-pmp 2.2.11
+pt-pmp 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2014-09-25 13:48:22 +0000
+++ bin/pt-query-digest	2014-11-14 14:12:25 +0000
@@ -64,7 +64,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -13181,6 +13181,13 @@
                if ( $fh ) {
                   PTDEBUG && _d('Reading', $filename);
                   PTDEBUG && _d('File size:', $filesize);
+                  # catch if user is trying to use an uncoverted (raw) binlog  # issue 1377888
+                  if ( $filename &&  $o->get('type')->[0] eq 'binlog') {
+                     if (is_raw_binlog($filename)) {
+                        warn "Binlog file $filename must first be converted to text format using mysqlbinlog";
+                        return 1;
+                     }
+                  }
                   push @read_files, { name => ($filename || "STDIN"), size => $filesize };
 
                   # Read the file offset for --resume.
@@ -14722,6 +14729,14 @@
    return;
 }
 
+# make an effort to check if file is a raw binlog
+# (i.e. was not converted to text using mysqlbinlog)
+sub is_raw_binlog {
+   my $filename = shift;
+   
+   return -B $filename; 
+}
+
 sub _d {
    my ($package, undef, $line) = caller 0;
    @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
@@ -14798,7 +14813,8 @@
 
 pt-query-digest is a sophisticated but easy to use tool for analyzing
 MySQL queries.  It can analyze queries from MySQL slow, general, and binary
-logs, as well as C<SHOW PROCESSLIST> and MySQL protocol data from tcpdump.
+logs. (Binary logs must first be converted to text, see L<"--type">).
+It can also use C<SHOW PROCESSLIST> and MySQL protocol data from tcpdump.
 By default, the tool reports which queries are the slowest, and therefore
 the most important to optimize.  More complex and custom-tailored reports
 can be created by using options like L<"--group-by">, L<"--filter">, and
@@ -16134,7 +16150,13 @@
 
 =item binlog
 
-Parse a binary log file.
+Parse a binary log file that has first been converted to text using mysqlbinlog.
+
+For example: 
+
+   mysqlbinlog mysql-bin.000441 > mysql-bin.000441.txt
+
+   pt-query-digest --type binlog mysql-bin.000441.txt
 
 =item genlog
 
@@ -16595,6 +16617,6 @@
 
 =head1 VERSION
 
-pt-query-digest 2.2.11
+pt-query-digest 2.2.12
 
 =cut
 
=== modified file 'bin/pt-show-grants'
--- bin/pt-show-grants	2014-09-25 13:48:22 +0000
+++ bin/pt-show-grants	2014-11-14 14:12:25 +0000
@@ -903,6 +903,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -2406,6 +2414,6 @@
 
 =head1 VERSION
 
-pt-show-grants 2.2.11
+pt-show-grants 2.2.12
 
 =cut
 
=== modified file 'bin/pt-sift'
--- bin/pt-sift	2014-09-25 13:48:22 +0000
+++ bin/pt-sift	2014-11-14 14:12:25 +0000
@@ -127,9 +127,10 @@
 
 usage_or_errors() {
    local file="$1"
+   local version=""
 
    if [ "$OPT_VERSION" ]; then
-      local version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
+      version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
       echo "$version"
       return 1
    fi
@@ -351,6 +352,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -1237,7 +1240,7 @@
 
 =head1 VERSION
 
-pt-sift 2.2.11
+pt-sift 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-slave-delay'
--- bin/pt-slave-delay	2014-09-25 13:48:22 +0000
+++ bin/pt-slave-delay	2014-11-14 14:12:25 +0000
@@ -40,7 +40,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4869,6 +4869,6 @@
 
 =head1 VERSION
 
-pt-slave-delay 2.2.11
+pt-slave-delay 2.2.12
 
 =cut
 
=== modified file 'bin/pt-slave-find'
--- bin/pt-slave-find	2014-09-25 13:48:22 +0000
+++ bin/pt-slave-find	2014-11-14 14:12:25 +0000
@@ -911,6 +911,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -4334,6 +4342,6 @@
 
 =head1 VERSION
 
-pt-slave-find 2.2.11
+pt-slave-find 2.2.12
 
 =cut
 
=== modified file 'bin/pt-slave-restart'
--- bin/pt-slave-restart	2014-09-25 13:48:22 +0000
+++ bin/pt-slave-restart	2014-11-14 14:12:25 +0000
@@ -41,7 +41,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5937,6 +5937,6 @@
 
 =head1 VERSION
 
-pt-slave-restart 2.2.11
+pt-slave-restart 2.2.12
 
 =cut
 
=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2014-09-25 13:48:22 +0000
+++ bin/pt-stalk	2014-11-14 14:12:25 +0000
@@ -140,9 +140,10 @@
 
 usage_or_errors() {
    local file="$1"
+   local version=""
 
    if [ "$OPT_VERSION" ]; then
-      local version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
+      version=$(grep '^pt-[^ ]\+ [0-9]' "$file")
       echo "$version"
       return 1
    fi
@@ -364,6 +365,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -779,6 +782,7 @@
 CMD_SYSCTL="${CMD_SYSCTL:-"$(_which sysctl)"}"
 CMD_TCPDUMP="${CMD_TCPDUMP:-"$(_which tcpdump)"}"
 CMD_VMSTAT="${CMD_VMSTAT:-"$(_which vmstat)"}"
+CMD_DMESG="${CMD_DMESG:-"$(_which dmesg)"}"
 
 [ -z "$CMD_SYSCTL" -a -x "/sbin/sysctl" ] && CMD_SYSCTL="/sbin/sysctl"
 
@@ -862,6 +866,14 @@
    if [ "$CMD_SYSCTL" ]; then
       $CMD_SYSCTL -a >> "$d/$p-sysctl" &
    fi
+
+   # collect dmesg events from 60 seconds ago until present
+   if [ "$CMD_DMESG" ]; then
+      local UPTIME=`cat /proc/uptime | awk '{ print $1 }'`
+      local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}')
+      $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & 
+   fi
+
    local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
    if [ "$CMD_VMSTAT" ]; then
       $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &
@@ -876,6 +888,7 @@
       $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" &
    fi
 
+
    $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
    local mysqladmin_pid=$!
 
@@ -2225,7 +2238,7 @@
 
 =head1 VERSION
 
-pt-stalk 2.2.11
+pt-stalk 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-summary'
--- bin/pt-summary	2014-09-25 13:48:22 +0000
+++ bin/pt-summary	2014-11-14 14:12:25 +0000
@@ -320,6 +320,8 @@
 
          [ "$config_opt" = "" ] && continue
 
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          if ! [ "$HAVE_EXT_ARGV" ]; then
             config_opt="--$config_opt"
          fi
@@ -2691,7 +2693,7 @@
 
 =head1 VERSION
 
-pt-summary 2.2.11
+pt-summary 2.2.12
 
 =cut
 
 
=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2014-09-25 13:48:22 +0000
+++ bin/pt-table-checksum	2014-11-14 14:12:25 +0000
@@ -57,7 +57,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3533,7 +3533,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -3544,7 +3544,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -3563,6 +3563,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -3624,6 +3631,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -3633,7 +3651,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -3788,8 +3807,26 @@
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
-   my $seen_ids = $args{seen_ids};
-   return Cxn->remove_duplicate_cxns(%args);
+   my $seen_ids = $args{seen_ids} || {};
+   PTDEBUG && _d("Removing duplicates nodes from ", join(" ", map { $_->name } @cxns));
+   my @trimmed_cxns;
+
+   for my $cxn ( @cxns ) {
+      my $dbh  = $cxn->dbh();
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
+      PTDEBUG && _d($sql);
+      my ($id) = $dbh->selectrow_array($sql);
+      PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
+
+      if ( ! $seen_ids->{$id}++ ) {
+         push @trimmed_cxns, $cxn
+      }
+      else {
+         PTDEBUG && _d("Removing ", $cxn->name,
+                       ", ID ", $id, ", because we've already seen it");
+      }
+   }
+   return \@trimmed_cxns;
 }
 
 sub same_cluster {
@@ -9286,7 +9323,8 @@
       my %seen_ids;
       for my $cxn ($master_cxn, @$slaves) {
          my $dbh  = $cxn->dbh();
-         my $sql  = q{SELECT @@server_id};
+         # if it's a cluster node we use its incoming address as id ( see https://bugs.launchpad.net/percona-toolkit/+bug/1217466 )
+         my $sql  = $cluster->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
          PTDEBUG && _d($cxn, $dbh, $sql);
          my ($id) = $dbh->selectrow_array($sql);
          $seen_ids{$id}++;
@@ -9363,9 +9401,11 @@
 
       if ( $cluster_name_for{$master_cxn} ) {
          if ( !@$slaves ) {
-            die $master_cxn->name() . " is a cluster node but no other nodes "
-               . "or regular replicas were found.  Use --recursion-method=dsn "
-               . "to specify the other nodes in the cluster.\n";
+            if ( ($o->get('recursion-method')->[0] || '') ne 'none' ) {
+               die $master_cxn->name() . " is a cluster node but no other nodes "
+                  . "or regular replicas were found.  Use --recursion-method=dsn "
+                  . "to specify the other nodes in the cluster.\n";
+            } 
          }
 
          # Make sure the master and all node are in the same cluster.
@@ -12240,9 +12280,13 @@
 The C<dsn> column contains a replica DSN like it would be given on the command
 line, for example: C<"h=replica_host,u=repl_user,p=repl_pass">.
 
-The C<none> method prevents the tool from connecting to any replicas.
-This effectively disables all the L<"REPLICA CHECKS"> because there will
-not be any replicas to check.  Therefore, this method is not recommended.
+The C<none> method makes the tool ignore all slaves and cluster nodes. This 
+method is not recommended because it effectively disables the 
+L<"REPLICA CHECKS"> and no differences can be found. It is useful, however, if 
+you only need to write checksums on the master or a single cluster node. The 
+safer alternative is C<--no-replicate-check>: the tool finds replicas and 
+cluster nodes, performs the L<"REPLICA CHECKS">, but does not check for 
+differences. See L<"--[no]replicate-check">.
 
 =item --replicate
 
@@ -12698,6 +12742,6 @@
 
 =head1 VERSION
 
-pt-table-checksum 2.2.11
+pt-table-checksum 2.2.12
 
 =cut
 
=== modified file 'bin/pt-table-sync'
--- bin/pt-table-sync	2014-09-25 13:48:22 +0000
+++ bin/pt-table-sync	2014-11-14 14:12:25 +0000
@@ -55,7 +55,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -12768,6 +12768,6 @@
 
 =head1 VERSION
 
-pt-table-sync 2.2.11
+pt-table-sync 2.2.12
 
 =cut
 
=== modified file 'bin/pt-table-usage'
--- bin/pt-table-usage	2014-09-25 13:48:22 +0000
+++ bin/pt-table-usage	2014-11-14 14:12:25 +0000
@@ -1340,6 +1340,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -7563,6 +7571,6 @@
 
 =head1 VERSION
 
-pt-table-usage 2.2.11
+pt-table-usage 2.2.12
 
 =cut
 
=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade	2014-09-25 13:48:22 +0000
+++ bin/pt-upgrade	2014-11-14 14:12:25 +0000
@@ -61,7 +61,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2464,7 +2464,7 @@
       set             => $args{set},
       NAME_lc         => defined($args{NAME_lc}) ? $args{NAME_lc} : 1,
       dbh_set         => 0,
-      ask_pass        => $o->get('ask-pass'),
+      ask_pass        => $args{ask_pass},
       DSNParser       => $dp,
       is_cluster_node => undef,
       parent          => $args{parent},
@@ -2475,7 +2475,7 @@
 
 sub connect {
    my ( $self, %opts ) = @_;
-   my $dsn = $self->{dsn};
+   my $dsn = $opts{dsn} || $self->{dsn};
    my $dp  = $self->{DSNParser};
 
    my $dbh = $self->{dbh};
@@ -2494,6 +2494,13 @@
    }
 
    $dbh = $self->set_dbh($dbh);
+   if ( $opts{dsn} ) {
+      $self->{dsn}      = $dsn;
+      $self->{dsn_name} = $dp->as_string($dsn, [qw(h P S)])
+                       || $dp->as_string($dsn, [qw(F)])
+                       || '';
+
+   }
    PTDEBUG && _d($dbh, 'Connected dbh to', $self->{hostname},$self->{dsn_name});
    return $dbh;
 }
@@ -2555,6 +2562,17 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
@@ -2564,7 +2582,8 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
@@ -11240,6 +11259,6 @@
 
 =head1 VERSION
 
-pt-upgrade 2.2.11
+pt-upgrade 2.2.12
 
 =cut
 
=== modified file 'bin/pt-variable-advisor'
--- bin/pt-variable-advisor	2014-09-25 13:48:22 +0000
+++ bin/pt-variable-advisor	2014-11-14 14:12:25 +0000
@@ -44,7 +44,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6138,6 +6138,6 @@
 
 =head1 VERSION
 
-pt-variable-advisor 2.2.11
+pt-variable-advisor 2.2.12
 
 =cut
 
=== modified file 'bin/pt-visual-explain'
--- bin/pt-visual-explain	2014-09-25 13:48:22 +0000
+++ bin/pt-visual-explain	2014-11-14 14:12:25 +0000
@@ -1577,6 +1577,14 @@
          $parse  = 0;
          next LINE;
       }
+
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
@@ -3243,6 +3251,6 @@
 
 =head1 VERSION
 
-pt-visual-explain 2.2.11
+pt-visual-explain 2.2.12
 
 =cut
 
=== modified file 'config/deb/changelog'
--- config/deb/changelog	2014-09-25 13:48:22 +0000
+++ config/deb/changelog	2014-11-14 14:12:25 +0000
@@ -1,3 +1,16 @@
+percona-toolkit (2.2.12) unstable; urgency=low
+
+  * Fixed bug 1376561:	pt-archiver is not able to archive all the rows when a table has a hash partition
+  * Fixed bug 1328686:	pt-heartbeat check-read-only option does not prevent creates or inserts
+  * Fixed bug 1269695:	pt-online-schema-change does not allow ALTER for a table without a non-unique, while manual does not explain this
+  * Fixed bug 1217466:	pt-table-checksum refuses to run on PXC if server_id is the same on all nodes
+  * Fixed bug 1373937:	pt-table-checksum requires recursion when working with and XtraDB Cluster node
+  * Fixed bug 1377888:	pt-query-digest manual for --type binlog is ambiguous
+  * Fixed bug 1349086:	pt-stalk should also gather dmesg output 
+  * Fixed bug 1361293:	Some scripts fail when no-version-check option is put in global config file
+
+ -- Percona Toolkit Developers <[e-mail]>  Tue, 11 Nov 2014 13:02:51 +0000
+
 percona-toolkit (2.2.11) unstable; urgency=low
 
   * Fixed bug 1262456: pt-query-digest doesn't report host details
 
=== modified file 'config/sphinx-build/conf.py'
--- config/sphinx-build/conf.py	2014-09-25 13:48:22 +0000
+++ config/sphinx-build/conf.py	2014-11-14 14:12:25 +0000
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.11'
+release = '2.2.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
=== modified file 'docs/percona-toolkit.pod'
--- docs/percona-toolkit.pod	2014-09-25 13:48:22 +0000
+++ docs/percona-toolkit.pod	2014-11-14 14:12:25 +0000
@@ -557,6 +557,6 @@
 
 =head1 VERSION
 
-Percona Toolkit v2.2.11 released 2014-09-25
+Percona Toolkit v2.2.12 released 2014-11-11
 
 =cut
 
=== modified file 'docs/release_notes.rst'
--- docs/release_notes.rst	2014-09-25 13:48:22 +0000
+++ docs/release_notes.rst	2014-11-14 14:12:25 +0000
@@ -1,6 +1,41 @@
 Release Notes
 *************
 
+v2.2.12 released 2014-11-14
+===========================
+
+Percona Toolkit 2.2.12 has been released. This release contains one new feature and seven bug fixes.
+
+New Features:
+
+* pt-stalk now gathers ``dmesg`` output from up to 60 seconds before the triggering event. 
+
+Bugs Fixed:
+
+* Fixed bug 1376561: pt-archiver was not able to archive all the rows when a table had a hash partition. Fixed by implementing support for tables which have primary or unique indexes.
+
+* Fixed bug 1217466: pt-table-checksum would refuses to run on Percona XtraDB Cluster if ``server_id`` was the same on all nodes. Fixed by using the ``wsrep_node_incoming_address`` as a unique identifier for cluster nodes, instead of relying on ``server_id``.
+
+* Fixed bug 1269695: pt-online-schema-change documentation now contains more information about limitations on why it isn't running ``ALTER TABLE`` for a table which has only a non-unique index.
+
+* Fixed bug 1328686: Running pt-hearbeat with --check-read-only option would cause an error when running on server with ``read_only`` option. Tool now waits for server ``read_only`` status to be disabled before starting to run.
+
+* Fixed bug 1373937: pt-table-checksum now supports ``none`` as valid ``--recursion-method`` when using with Percona XtraDB Cluster. 
+
+* Fixed bug 1377888: Documentation was stating that pt-query-digest is able to parse a raw binary log file, while it can only parse a file which was decoded with ``mysqlbinlog`` tool before. Fixed by improving the documentation and adding a check for binary file and providing a relevant error message.
+
+Changelog
+---------
+
+* Fixed bug 1376561:	pt-archiver is not able to archive all the rows when a table has a hash partition
+* Fixed bug 1328686:	pt-heartbeat check-read-only option does not prevent creates or inserts
+* Fixed bug 1269695:	pt-online-schema-change does not allow ALTER for a table without a non-unique, while manual does not explain this
+* Fixed bug 1217466:	pt-table-checksum refuses to run on PXC if server_id is the same on all nodes
+* Fixed bug 1373937:	pt-table-checksum requires recursion when working with and XtraDB Cluster node
+* Fixed bug 1377888:	pt-query-digest manual for --type binlog is ambiguous
+* Fixed bug 1349086:	pt-stalk should also gather dmesg output 
+* Fixed bug 1361293:	Some scripts fail when no-version-check option is put in global config file
+
 v2.2.11 released 2014-09-26
 ===========================
 
 
=== modified file 'lib/Cxn.pm'
--- lib/Cxn.pm	2013-12-05 00:14:17 +0000
+++ lib/Cxn.pm	2014-11-14 14:12:25 +0000
@@ -226,6 +226,19 @@
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
+# This is used to help remove_duplicate_cxns detect cluster nodes
+# (which often have unreliable server_id's)
+sub is_cluster_node {
+   my ($self, $cxn) = @_;
+
+   my $sql = "SHOW VARIABLES LIKE 'wsrep\_on'";
+   PTDEBUG && _d($cxn->name, $sql);
+   my $row = $cxn->dbh->selectrow_arrayref($sql);
+   PTDEBUG && _d(Dumper($row));
+   return $row && $row->[1] && ($row->[1] eq 'ON' || $row->[1] eq '1') ? 1 : 0;
+
+}
+
 # There's two reasons why there might be dupes:
 # If the "master" is a cluster node, then a DSN table might have been
 # used, and it may have all nodes' DSNs so the user can run the tool
@@ -233,7 +246,7 @@
 # on the command line.
 # On the other hand, maybe find_cluster_nodes worked, in which case
 # we definitely have a dupe for the master cxn, but we may also have a
-# dupe for every other node if this was unsed in conjunction with a
+# dupe for every other node if this was used in conjunction with a
 # DSN table.
 # So try to detect and remove those.
 sub remove_duplicate_cxns {
@@ -245,7 +258,11 @@
 
    for my $cxn ( @cxns ) {
       my $dbh  = $cxn->dbh();
-      my $sql  = q{SELECT @@server_id};
+
+      # Very often cluster nodes are configured with matching server_id's 
+      # So in that case we'll use its incoming address as its unique identifier
+      # Note: this relies on "seen_ids" being populated using the same strategy  
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
       PTDEBUG && _d($sql);
       my ($id) = $dbh->selectrow_array($sql);
       PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
 
=== modified file 'lib/OptionParser.pm'
--- lib/OptionParser.pm	2014-05-24 21:36:33 +0000
+++ lib/OptionParser.pm	2014-11-14 14:12:25 +0000
@@ -1132,6 +1132,16 @@
          $parse  = 0;
          next LINE;
       }
+
+      # Silently ignore option [no]-version-check if it is unsupported and it comes from a config file
+      # TODO: Ideally , this should be generalized for all unsupported options that come from global files
+      if (  $parse 
+            && !$self->has('version-check') 
+            && $line =~ /version-check/ 
+      ) {
+         next LINE;
+      }
+
       if ( $parse
          && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
       ) {
 
=== modified file 'lib/Percona/Toolkit.pm'
--- lib/Percona/Toolkit.pm	2014-09-24 15:06:32 +0000
+++ lib/Percona/Toolkit.pm	2014-11-14 14:12:25 +0000
@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;
 
-our $VERSION = '2.2.11';
+our $VERSION = '2.2.12';
 
 use strict;
 use warnings FATAL => 'all';
 
=== modified file 'lib/Percona/XtraDB/Cluster.pm'
--- lib/Percona/XtraDB/Cluster.pm	2013-04-16 20:40:32 +0000
+++ lib/Percona/XtraDB/Cluster.pm	2014-11-14 14:12:25 +0000
@@ -132,8 +132,29 @@
 sub remove_duplicate_cxns {
    my ($self, %args) = @_;
    my @cxns     = @{$args{cxns}};
-   my $seen_ids = $args{seen_ids};
-   return Cxn->remove_duplicate_cxns(%args);
+   my $seen_ids = $args{seen_ids} || {};
+   PTDEBUG && _d("Removing duplicates nodes from ", join(" ", map { $_->name } @cxns));
+   my @trimmed_cxns;
+
+   for my $cxn ( @cxns ) {
+      my $dbh  = $cxn->dbh();
+      # Very often cluster nodes are configured with matching server_id's
+      # So in that case we'll use its incoming address as its unique identifier
+      # Note: This relies on "seen_ids" being populated using the same strategy  
+      my $sql  = $self->is_cluster_node($cxn) ? q{SELECT @@wsrep_node_incoming_address} : q{SELECT @@server_id};
+      PTDEBUG && _d($sql);
+      my ($id) = $dbh->selectrow_array($sql);
+      PTDEBUG && _d('Server ID for ', $cxn->name, ': ', $id);
+
+      if ( ! $seen_ids->{$id}++ ) {
+         push @trimmed_cxns, $cxn
+      }
+      else {
+         PTDEBUG && _d("Removing ", $cxn->name,
+                       ", ID ", $id, ", because we've already seen it");
+      }
+   }
+   return \@trimmed_cxns;
 }
 
 sub same_cluster {
 
=== modified file 'lib/bash/collect.sh'
--- lib/bash/collect.sh	2013-12-14 04:19:51 +0000
+++ lib/bash/collect.sh	2014-11-14 14:12:25 +0000
@@ -40,6 +40,7 @@
 CMD_SYSCTL="${CMD_SYSCTL:-"$(_which sysctl)"}"
 CMD_TCPDUMP="${CMD_TCPDUMP:-"$(_which tcpdump)"}"
 CMD_VMSTAT="${CMD_VMSTAT:-"$(_which vmstat)"}"
+CMD_DMESG="${CMD_DMESG:-"$(_which dmesg)"}"
 
 # Try to find command manually.
 [ -z "$CMD_SYSCTL" -a -x "/sbin/sysctl" ] && CMD_SYSCTL="/sbin/sysctl"
@@ -146,6 +147,14 @@
    if [ "$CMD_SYSCTL" ]; then
       $CMD_SYSCTL -a >> "$d/$p-sysctl" &
    fi
+
+   # collect dmesg events from 60 seconds ago until present
+   if [ "$CMD_DMESG" ]; then
+      local UPTIME=`cat /proc/uptime | awk '{ print $1 }'`
+      local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}')
+      $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & 
+   fi
+
    local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
    if [ "$CMD_VMSTAT" ]; then
       $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &
 
=== modified file 'lib/bash/parse_options.sh'
--- lib/bash/parse_options.sh	2014-07-10 20:15:13 +0000
+++ lib/bash/parse_options.sh	2014-11-14 14:12:25 +0000
@@ -347,6 +347,9 @@
          # Skip blank lines.
          [ "$config_opt" = "" ] && continue
 
+         # Skip global option [no]version-check which don't apply
+         echo "$config_opt" | grep -v 'version-check' >/dev/null 2>&1 || continue
+
          # Options in a config file are not prefixed with --,
          # but command line options are, so one or the other has
          # to add or remove the -- prefix.  We add it for config
 
=== modified file 't/lib/OptionParser.t'
--- t/lib/OptionParser.t	2014-05-24 21:36:33 +0000
+++ t/lib/OptionParser.t	2014-11-14 14:12:25 +0000
@@ -2141,6 +2141,29 @@
    'prompt_no_echo outputs prompt to STDERR'
 );
 
+# #############################################################################
+#  Issue 1361293: Global config file with no-version-check option makes tools
+#  that don't recognize the option fail.
+# #############################################################################
+diag(`echo "no-version-check" > ~/.OptionParser.t.conf`);
+$o = new OptionParser(
+   description  => 'OptionParser.t parses command line options.',
+   usage        => "$PROGRAM_NAME <options>"
+);
+$o->get_specs("$trunk/bin/pt-slave-find"),   # doesn't have version-check option
+$output = output(  
+         sub {
+            $o->get_opts();
+         },
+         stderr=>1
+      );
+unlike(
+   $output,
+   qr/Unknown option: no-version-check/,
+   'no-version-check ignored if unsupported and in config file. issue 1361293'
+);
+diag(`rm -rf ~/.OptionParser.t.conf`);
+
 
 
 # #############################################################################
 
=== added file 't/lib/samples/binlogs/raw_binlog.log'
 Binary files t/lib/samples/binlogs/raw_binlog.log	1970-01-01 00:00:00 +0000 and t/lib/samples/binlogs/raw_binlog.log	2014-11-14 14:12:25 +0000 differ
=== modified file 't/pt-archiver/basics.t'
--- t/pt-archiver/basics.t	2012-11-21 16:21:30 +0000
+++ t/pt-archiver/basics.t	2014-11-14 14:12:25 +0000
@@ -161,7 +161,7 @@
 my $t = time - $t0;
 
 ok(
-   $t >= 2 && $t <= 3.5,
+   $t >= 2 && $t <= ($ENV{PERCONA_SLOW_BOX} ? 5 : 3),
    "--sleep between SELECT (bug 979092)"
 ) or diag($output, "t=", $t);
 
 
=== modified file 't/pt-archiver/indexes.t'
--- t/pt-archiver/indexes.t	2012-06-03 17:54:32 +0000
+++ t/pt-archiver/indexes.t	2014-11-14 14:12:25 +0000
@@ -97,7 +97,7 @@
 
 # Check ascending only first column
 $output = `$cmd --where 1=1 --dry-run --ascend-first --source D=test,t=table_5,F=$cnf --purge --limit 50 2>&1`;
-like ( $output, qr/WHERE \(1=1\) AND \(\(`a` >= \?\)\) LIMIT/, 'Can ascend just first column');
+like ( $output, qr/WHERE \(1=1\) AND \(\(`a` >= \?\)\) ORDER BY `a`,`b`,`c`,`d` LIMIT/, 'Can ascend just first column');
 
 # #############################################################################
 # Done.
 
=== modified file 't/pt-archiver/samples/issue-248.txt'
--- t/pt-archiver/samples/issue-248.txt	2011-06-24 22:02:05 +0000
+++ t/pt-archiver/samples/issue-248.txt	2014-11-14 14:12:25 +0000
@@ -1,3 +1,3 @@
-SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') LIMIT 1
-SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') AND ((`film_id` >= ?)) LIMIT 1
+SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') ORDER BY `film_id` LIMIT 1
+SELECT /*!40001 SQL_NO_CACHE */ `film_id`,`title`,`description`,`release_year`,`language_id`,`original_language_id`,`rental_duration`,`rental_rate`,`length`,`replacement_cost`,`rating`,`special_features`,`last_update` FROM `sakila`.`film` FORCE INDEX(`PRIMARY`) WHERE (film_id < 100) AND (`film_id` < '1000') AND ((`film_id` >= ?)) ORDER BY `film_id` LIMIT 1
 DELETE FROM `sakila`.`film` WHERE (`film_id` = ?)
 
=== modified file 't/pt-query-digest/binlog_analyses.t'
--- t/pt-query-digest/binlog_analyses.t	2014-07-02 20:55:31 +0000
+++ t/pt-query-digest/binlog_analyses.t	2014-11-14 14:12:25 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use PerconaTest;
 require "$trunk/bin/pt-query-digest";
@@ -46,6 +46,26 @@
    'Analysis for binlog011 - Handles 5.6 binlog with checksum CRC32',
 ) or diag($test_diff);
 
+
+
+# #############################################################################
+# Issue 1377888: refuse to parse raw binary log 
+# #############################################################################
+
+my $output = output(
+    sub { pt_query_digest::main(@args, "$trunk/t/lib/samples/binlogs/raw_binlog.log") },
+   stderr => 1
+);
+
+like( 
+   $output,
+   qr/mysqlbinlog/i,
+   'Refuses to parse raw binlog file'
+);
+    
+
+
+
 # #############################################################################
 # Done.
 # #############################################################################
 
=== modified file 't/pt-table-checksum/pxc.t'
--- t/pt-table-checksum/pxc.t	2013-04-12 15:58:10 +0000
+++ t/pt-table-checksum/pxc.t	2014-11-14 14:12:25 +0000
@@ -81,6 +81,17 @@
    "Dies if no other nodes are found"
 );
 
+
+($output, $exit_status) = full_output(
+   sub { pt_table_checksum::main(@args, '--recursion-method', 'none') },
+   stderr => 1,
+);
+
+ok (
+      $output =~ qr/WARNING/i && !$exit_status,
+      "Warns but doesn't die if --recursion-method=none - issue #1373937"
+);
+
 for my $args (
       ["using recusion-method=dsn", '--recursion-method', "dsn=$node1_dsn,D=dsns,t=dsns"],
       ["using recursion-method=cluster", '--recursion-method', 'cluster']
@@ -144,54 +155,89 @@
    "Node3 not changed"
 );
 
-for my $args (
-      ["using recusion-method=dsn", '--recursion-method', "dsn=$node1_dsn,D=dsns,t=dsns"],
-      ["using recursion-method=cluster", '--recursion-method', 'cluster']
-   )
-{
-   my $test = shift @$args;
-
-   $output = output(
-      sub { pt_table_checksum::main(@args,
-         @$args)
-      },
-      stderr => 1,
-   );
-
-   is(
-      PerconaTest::count_checksum_results($output, 'errors'),
-      0,
-      "1 diff: no errors ($test)"
-   );
-
-   is(
-      PerconaTest::count_checksum_results($output, 'skipped'),
-      0,
-      "1 diff: no skips ($test)"
-   );
-
-   is(
-      PerconaTest::count_checksum_results($output, 'diffs'),
-      1,
-      "1 diff: 1 diff ($test)"
-   ) or diag($output);
-
-   # 11-17T13:02:54      0      1       26       1       0   0.021 test.t
-   like(
-      $output,
-      qr/^\S+\s+  # ts
-         0\s+     # errors
-         1\s+     # diffs
-         26\s+    # rows
-         \d+\s+   # chunks
-         0\s+     # skipped
-         \S+\s+   # time
-         test.t$  # table
-      /xm,
-      "1 diff: it's in test.t ($test)"
-   );
+sub test_recursion_methods {
+   my $same_ids = shift;
+
+   my ($orig_id_1, $orig_id_2, $orig_id_3);
+
+   if ($same_ids) {
+      # save original values
+      my $sql = 'SELECT @@server_id';
+      ($orig_id_1) = $node1->selectrow_array($sql);
+      ($orig_id_2) = $node2->selectrow_array($sql);
+      ($orig_id_3) = $node3->selectrow_array($sql);
+      # set server_id  value to 1 on all nodes
+      $sql = 'SET GLOBAL server_id = 1';
+      $node1->do($sql);
+      $node2->do($sql);
+      $node3->do($sql);
+   }
+
+   for my $args (
+         ["using recusion-method=dsn", '--recursion-method', "dsn=$node1_dsn,D=dsns,t=dsns"],
+         ["using recursion-method=cluster", '--recursion-method', 'cluster']
+      )
+   {
+      my $test = shift @$args;
+      $test = $same_ids ? $test.' - Nodes with different ids' : $test.' - Nodes with same ids';
+
+      $output = output(
+         sub { pt_table_checksum::main(@args,
+            @$args)
+         },
+         stderr => 1,
+      );
+
+      is(
+         PerconaTest::count_checksum_results($output, 'errors'),
+         0,
+         "1 diff: no errors ($test)"
+      );
+
+      is(
+         PerconaTest::count_checksum_results($output, 'skipped'),
+         0,
+         "1 diff: no skips ($test)"
+      );
+
+      is(
+         PerconaTest::count_checksum_results($output, 'diffs'),
+         1,
+         "1 diff: 1 diff ($test)"
+      ) or diag($output);
+
+      # 11-17T13:02:54      0      1       26       1       0   0.021 test.t
+      like(
+         $output,
+         qr/^\S+\s+  # ts
+            0\s+     # errors
+            1\s+     # diffs
+            26\s+    # rows
+            \d+\s+   # chunks
+            0\s+     # skipped
+            \S+\s+   # time
+            test.t$  # table
+         /xm,
+         "1 diff: it's in test.t ($test)"
+      );
+   }
+
+   if ($same_ids) {
+      # reset server_id's to original values
+      $node1->do("SET GLOBAL server_id = $orig_id_1");
+      $node2->do("SET GLOBAL server_id = $orig_id_2");
+      $node3->do("SET GLOBAL server_id = $orig_id_3");
+   }
+
 }
 
+# test recursion methods
+test_recursion_methods(0);
+
+# test recursion methods when all nodes have the same id
+test_recursion_methods(1);
+
+
 # #############################################################################
 # cluster, node1 -> slave, run on node1
 # #############################################################################
@@ -232,7 +278,7 @@
    # Wait for the slave to apply the binlogs from node1 (its master).
    # Then change it so it's not consistent.
    PerconaTest::wait_for_table($slave_dbh, 'test.t');
-   $sb->wait_for_slaves('cslave1');
+   $sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
    $slave_dbh->do("update test.t set c='zebra' where c='z'");
 
    $output = output(