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

[Tomislav Plavcic]

Release branch for Percona Toolkit version 2.2.10

=== modified file 'Changelog'
--- Changelog	2014-07-08 12:06:12 +0000
+++ Changelog	2014-08-08 14:10:17 +0000
@@ -1,8 +1,16 @@
 Changelog for Percona Toolkit
 
+v2.2.10 released 2014-08-06
+
+  * Fixed bug 1287253: pt-table-checksum deadlock 
+  * Fixed bug 1299387: 5.6 slow query log Thead_id becomes Id
+  * Fixed bug 1311654: pt-table-checksum + PXC inconsistent results upon --resume
+  * Fixed bug 1340728: pt-online-schema-change doesn't work with HASH indexes
+  * Fixed bug 1253872: pt-table-checksum max load 20% rounds down
+  * Fixed bug 1340364: some shell tools output error when queried for --version 
+
 v2.2.9 released 2014-07-08
 
-
   * Fixed bug 1258135: pt-deadlock-logger introduces a noise to MySQL
   * Fixed bug 1329422: pt-online-schema-change foreign-keys-method=none breaks constraints 
   * Fixed bug 1315130: pt-online-schema-change not properly detecting foreign keys 

=== modified file 'Makefile.PL'
--- Makefile.PL	2014-07-08 12:06:12 +0000
+++ Makefile.PL	2014-08-08 14:10:17 +0000
@@ -2,7 +2,7 @@
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '2.2.9',
+    VERSION   => '2.2.10',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',

=== modified file 'bin/pt-align'
--- bin/pt-align	2014-07-04 17:16:08 +0000
+++ bin/pt-align	2014-08-08 14:10:17 +0000
@@ -1323,6 +1323,6 @@
 
 =head1 VERSION
 
-pt-align 2.2.9
+pt-align 2.2.10
 
 =cut

=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2014-07-04 17:16:08 +0000
+++ bin/pt-archiver	2014-08-08 14:10:17 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -7892,6 +7892,6 @@
 
 =head1 VERSION
 
-pt-archiver 2.2.9
+pt-archiver 2.2.10
 
 =cut

=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2014-07-04 17:16:08 +0000
+++ bin/pt-config-diff	2014-08-08 14:10:17 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5733,6 +5733,6 @@
 
 =head1 VERSION
 
-pt-config-diff 2.2.9
+pt-config-diff 2.2.10
 
 =cut

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2014-07-04 17:16:08 +0000
+++ bin/pt-deadlock-logger	2014-08-08 14:10:17 +0000
@@ -42,7 +42,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5523,6 +5523,6 @@
 
 =head1 VERSION
 
-pt-deadlock-logger 2.2.9
+pt-deadlock-logger 2.2.10
 
 =cut

=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2014-07-04 17:16:08 +0000
+++ bin/pt-diskstats	2014-08-08 14:10:17 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5579,6 +5579,6 @@
 
 =head1 VERSION
 
-pt-diskstats 2.2.9
+pt-diskstats 2.2.10
 
 =cut

=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2014-07-04 17:16:08 +0000
+++ bin/pt-duplicate-key-checker	2014-08-08 14:10:17 +0000
@@ -39,7 +39,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5600,6 +5600,6 @@
 
 =head1 VERSION
 
-pt-duplicate-key-checker 2.2.9
+pt-duplicate-key-checker 2.2.10
 
 =cut

=== modified file 'bin/pt-fifo-split'
--- bin/pt-fifo-split	2014-07-04 17:16:08 +0000
+++ bin/pt-fifo-split	2014-08-08 14:10:17 +0000
@@ -1612,6 +1612,6 @@
 
 =head1 VERSION
 
-pt-fifo-split 2.2.9
+pt-fifo-split 2.2.10
 
 =cut

=== modified file 'bin/pt-find'
--- bin/pt-find	2014-07-04 17:16:08 +0000
+++ bin/pt-find	2014-08-08 14:10:17 +0000
@@ -35,7 +35,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4984,6 +4984,6 @@
 
 =head1 VERSION
 
-pt-find 2.2.9
+pt-find 2.2.10
 
 =cut

=== modified file 'bin/pt-fingerprint'
--- bin/pt-fingerprint	2014-07-04 17:16:08 +0000
+++ bin/pt-fingerprint	2014-08-08 14:10:17 +0000
@@ -2203,6 +2203,6 @@
 
 =head1 VERSION
 
-pt-fingerprint 2.2.9
+pt-fingerprint 2.2.10
 
 =cut

=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger	2014-07-04 17:16:08 +0000
+++ bin/pt-fk-error-logger	2014-08-08 14:10:17 +0000
@@ -37,7 +37,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4509,6 +4509,6 @@
 
 =head1 VERSION
 
-pt-fk-error-logger 2.2.9
+pt-fk-error-logger 2.2.10
 
 =cut

=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2014-07-04 17:16:08 +0000
+++ bin/pt-heartbeat	2014-08-08 14:10:17 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6192,6 +6192,6 @@
 
 =head1 VERSION
 
-pt-heartbeat 2.2.9
+pt-heartbeat 2.2.10
 
 =cut

=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2014-07-04 17:16:08 +0000
+++ bin/pt-index-usage	2014-08-08 14:10:17 +0000
@@ -45,7 +45,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2772,12 +2772,13 @@
    my ( $class ) = @_;
    my $self = {
       pending => [],
+      last_event_offset => undef,
    };
    return bless $self, $class;
 }
 
 my $slow_log_ts_line = qr/^# Time: ([0-9: ]{15})/;
-my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]/;
+my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]\s*(?:Id:\s*(\d+))?/;
 my $slow_log_hd_line = qr{
       ^(?:
       T[cC][pP]\s[pP]ort:\s+\d+ # case differs on windows/unix
@@ -2808,6 +2809,7 @@
       or defined($stmt = $next_event->())
    ) {
       my @properties = ('cmd', 'Query', 'pos_in_log', $pos_in_log);
+      $self->{last_event_offset} = $pos_in_log;
       $pos_in_log = $tell->();
 
       if ( $stmt =~ s/$slow_log_hd_line//go ){ # Throw away header lines in log
@@ -2840,19 +2842,25 @@
                push @properties, 'ts', $time;
                ++$got_ts;
                if ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
                ) {
                   PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
                   push @properties, 'user', $user, 'host', $host, 'ip', $ip;
-                  ++$got_uh;
+                  if ( $thread_id ) {  
+                     push @properties, 'Thread_id', $thread_id;
+                 }
+                 ++$got_uh;
                }
             }
 
             elsif ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
             ) {
-               PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
-               push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+                  push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  if ( $thread_id ) {       
+                     push @properties, 'Thread_id', $thread_id;
+                 }
                ++$got_uh;
             }
 
@@ -2933,9 +2941,15 @@
 
       PTDEBUG && _d('Properties of event:', Dumper(\@properties));
       my $event = { @properties };
-      if ( $args{stats} ) {
-         $args{stats}->{events_read}++;
-         $args{stats}->{events_parsed}++;
+      if ( !$event->{arg} ) {
+         PTDEBUG && _d('Partial event, no arg');
+      }
+      else {
+         $self->{last_event_offset} = undef;
+         if ( $args{stats} ) {
+            $args{stats}->{events_read}++;
+            $args{stats}->{events_parsed}++;
+         }
       }
       return $event;
    } # EVENT
@@ -7532,6 +7546,6 @@
 
 =head1 VERSION
 
-pt-index-usage 2.2.9
+pt-index-usage 2.2.10
 
 =cut

=== modified file 'bin/pt-ioprofile'
--- bin/pt-ioprofile	2014-07-04 17:16:08 +0000
+++ bin/pt-ioprofile	2014-08-08 14:10:17 +0000
@@ -1119,7 +1119,7 @@
 
 =head1 VERSION
 
-pt-ioprofile 2.2.9
+pt-ioprofile 2.2.10
 
 =cut
 

=== modified file 'bin/pt-kill'
--- bin/pt-kill	2014-07-04 17:16:08 +0000
+++ bin/pt-kill	2014-08-08 14:10:17 +0000
@@ -47,7 +47,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -8183,6 +8183,6 @@
 
 =head1 VERSION
 
-pt-kill 2.2.9
+pt-kill 2.2.10
 
 =cut

=== modified file 'bin/pt-mext'
--- bin/pt-mext	2014-07-04 17:16:08 +0000
+++ bin/pt-mext	2014-08-08 14:10:17 +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
@@ -791,7 +792,7 @@
 
 =head1 VERSION
 
-pt-mext 2.2.9
+pt-mext 2.2.10
 
 =cut
 

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2014-07-04 17:16:08 +0000
+++ bin/pt-mysql-summary	2014-08-08 14:10:17 +0000
@@ -88,9 +88,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
@@ -3089,7 +3090,7 @@
 
 =head1 VERSION
 
-pt-mysql-summary 2.2.9
+pt-mysql-summary 2.2.10
 
 =cut
 

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2014-07-04 17:16:08 +0000
+++ bin/pt-online-schema-change	2014-08-08 14:10:17 +0000
@@ -54,7 +54,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4785,6 +4785,7 @@
 
 use strict;
 use warnings FATAL => 'all';
+use POSIX qw( ceil );
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
@@ -4950,8 +4951,8 @@
       }
       else {
          PTDEBUG && _d('Initial', $var, 'value:', $init_val);
-         $val = int(($init_val * $threshold_factor) + $init_val);
-         $vars->{$var} = $val;
+         $val = ($init_val * $threshold_factor) + $init_val;
+         $vars->{$var} = int(ceil($val));
       }
       PTDEBUG && _d('Wait if', $var, '>=', $val);
    }
@@ -8908,28 +8909,31 @@
          # boundary sql.  This check applies to the next nibble.  So if
          # the current nibble number is 5, then nibble 5 is already done
          # and we're checking nibble number 6.
-         my $expl = explain_statement(
-            tbl  => $tbl,
-            sth  => $sth->{explain_upper_boundary},
-            vals => [ @{$boundary->{lower}}, $nibble_iter->limit() ],
-         );
-         if (lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '')) {
-            my $msg
-               = "Aborting copying table $tbl->{name} at chunk "
-               . ($nibble_iter->nibble_number() + 1)
-               . " because it is not safe to ascend.  Chunking should "
-               . "use the "
-               . ($nibble_iter->nibble_index() || '?')
-               . " index, but MySQL EXPLAIN reports that "
-               . ($expl->{key} ? "the $expl->{key}" : "no")
-               . " index will be used for "
-               . $sth->{upper_boundary}->{Statement}
-               . " with values "
-               . join(", ", map { defined $_ ? $_ : "NULL" }
-                      (@{$boundary->{lower}}, $nibble_iter->limit()))
-               . "\n";
-            die ts($msg);
-         } 
+         # Skip if --nocheck-plan   See: https://bugs.launchpad.net/percona-toolkit/+bug/1340728
+         if ( $o->get('check-plan') ) {
+            my $expl = explain_statement(
+               tbl  => $tbl,
+               sth  => $sth->{explain_upper_boundary},
+               vals => [ @{$boundary->{lower}}, $nibble_iter->limit() ],
+            );
+            if ( lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '') ) {
+               my $msg
+                  = "Aborting copying table $tbl->{name} at chunk "
+                  . ($nibble_iter->nibble_number() + 1)
+                  . " because it is not safe to ascend.  Chunking should "
+                  . "use the "
+                  . ($nibble_iter->nibble_index() || '?')
+                  . " index, but MySQL EXPLAIN reports that "
+                  . ($expl->{key} ? "the $expl->{key}" : "no")
+                  . " index will be used for "
+                  . $sth->{upper_boundary}->{Statement}
+                  . " with values "
+                  . join(", ", map { defined $_ ? $_ : "NULL" }
+                         (@{$boundary->{lower}}, $nibble_iter->limit()))
+                  . "\n";
+               die ts($msg);
+            } 
+         }
 
          # Once nibbling begins for a table, control does not return to this
          # tool until nibbling is done because, as noted above, all work is
@@ -9531,15 +9535,17 @@
       vals => [ @{$boundary->{lower}}, @{$boundary->{upper}} ],
    );
 
-   # Ensure that MySQL is using the chunk index if the table is being chunked.
-   if ( !$nibble_iter->one_nibble()
-        && lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '') )
-   {
-      die ts("Error copying rows at chunk " . $nibble_iter->nibble_number()
-         . " of $tbl->{db}.$tbl->{tbl} because MySQL chose "
-         . ($expl->{key} ? "the $expl->{key}" : "no") . " index "
-         . " instead of the " . $nibble_iter->nibble_index() . "index.\n");
-   }
+   # Ensure that MySQL is using the chunk index if the table is being chunked. 
+   # Skip if --nocheck-plan   See: https://bugs.launchpad.net/percona-toolkit/+bug/1340728
+      if ( !$nibble_iter->one_nibble()
+           && lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '') 
+           && $o->get('check-plan') )
+      {
+         die ts("Error copying rows at chunk " . $nibble_iter->nibble_number()
+            . " of $tbl->{db}.$tbl->{tbl} because MySQL chose "
+            . ($expl->{key} ? "the $expl->{key}" : "no") . " index "
+            . " instead of the " . $nibble_iter->nibble_index() . "index.\n");
+      }
 
    # Ensure that the chunk isn't too large if there's a --chunk-size-limit.
    # If single-chunking the table, this has already been checked, so it
@@ -9564,11 +9570,13 @@
       }
    }
 
-   # Ensure that MySQL is still using the entire index.
+   # Ensure that MySQL is still using the entire index. 
    # https://bugs.launchpad.net/percona-toolkit/+bug/1010232
+   # Skip if --nocheck-plan   See: https://bugs.launchpad.net/percona-toolkit/+bug/1340728
    if ( !$nibble_iter->one_nibble()
         && $tbl->{key_len}
-        && ($expl->{key_len} || 0) < $tbl->{key_len} )
+        && ($expl->{key_len} || 0) < $tbl->{key_len} 
+        && $o->get('check-plan') )
    {
       die ts("Error copying rows at chunk " . $nibble_iter->nibble_number()
          . " of $tbl->{db}.$tbl->{tbl} because MySQL used "
@@ -11555,6 +11563,6 @@
 
 =head1 VERSION
 
-pt-online-schema-change 2.2.9
+pt-online-schema-change 2.2.10
 
 =cut

=== modified file 'bin/pt-pmp'
--- bin/pt-pmp	2014-07-04 17:16:08 +0000
+++ bin/pt-pmp	2014-08-08 14:10:17 +0000
@@ -889,7 +889,7 @@
 
 =head1 VERSION
 
-pt-pmp 2.2.9
+pt-pmp 2.2.10
 
 =cut
 

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2014-07-04 17:16:08 +0000
+++ bin/pt-query-digest	2014-08-08 14:10:17 +0000
@@ -64,7 +64,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4972,7 +4972,7 @@
 }
 
 my $slow_log_ts_line = qr/^# Time: ([0-9: ]{15})/;
-my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]/;
+my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]\s*(?:Id:\s*(\d+))?/;
 my $slow_log_hd_line = qr{
       ^(?:
       T[cC][pP]\s[pP]ort:\s+\d+ # case differs on windows/unix
@@ -5036,19 +5036,25 @@
                push @properties, 'ts', $time;
                ++$got_ts;
                if ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
                ) {
                   PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
                   push @properties, 'user', $user, 'host', $host, 'ip', $ip;
-                  ++$got_uh;
+                  if ( $thread_id ) {  
+                     push @properties, 'Thread_id', $thread_id;
+                 }
+                 ++$got_uh;
                }
             }
 
             elsif ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
             ) {
-               PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
-               push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+                  push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  if ( $thread_id ) {       
+                     push @properties, 'Thread_id', $thread_id;
+                 }
                ++$got_uh;
             }
 
@@ -16587,6 +16593,6 @@
 
 =head1 VERSION
 
-pt-query-digest 2.2.9
+pt-query-digest 2.2.10
 
 =cut

=== modified file 'bin/pt-show-grants'
--- bin/pt-show-grants	2014-07-04 17:16:08 +0000
+++ bin/pt-show-grants	2014-08-08 14:10:17 +0000
@@ -2406,6 +2406,6 @@
 
 =head1 VERSION
 
-pt-show-grants 2.2.9
+pt-show-grants 2.2.10
 
 =cut

=== modified file 'bin/pt-sift'
--- bin/pt-sift	2014-07-04 17:16:08 +0000
+++ bin/pt-sift	2014-08-08 14:10:17 +0000
@@ -1237,7 +1237,7 @@
 
 =head1 VERSION
 
-pt-sift 2.2.9
+pt-sift 2.2.10
 
 =cut
 

=== modified file 'bin/pt-slave-delay'
--- bin/pt-slave-delay	2014-07-04 17:16:08 +0000
+++ bin/pt-slave-delay	2014-08-08 14:10:17 +0000
@@ -40,7 +40,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4869,6 +4869,6 @@
 
 =head1 VERSION
 
-pt-slave-delay 2.2.9
+pt-slave-delay 2.2.10
 
 =cut

=== modified file 'bin/pt-slave-find'
--- bin/pt-slave-find	2014-07-04 17:16:08 +0000
+++ bin/pt-slave-find	2014-08-08 14:10:17 +0000
@@ -4334,6 +4334,6 @@
 
 =head1 VERSION
 
-pt-slave-find 2.2.9
+pt-slave-find 2.2.10
 
 =cut

=== modified file 'bin/pt-slave-restart'
--- bin/pt-slave-restart	2014-07-04 17:16:08 +0000
+++ bin/pt-slave-restart	2014-08-08 14:10:17 +0000
@@ -41,7 +41,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5937,6 +5937,6 @@
 
 =head1 VERSION
 
-pt-slave-restart 2.2.9
+pt-slave-restart 2.2.10
 
 =cut

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2014-07-04 17:16:08 +0000
+++ bin/pt-stalk	2014-08-08 14:10:17 +0000
@@ -2211,7 +2211,7 @@
 
 =head1 VERSION
 
-pt-stalk 2.2.9
+pt-stalk 2.2.10
 
 =cut
 

=== modified file 'bin/pt-summary'
--- bin/pt-summary	2014-07-04 17:16:08 +0000
+++ bin/pt-summary	2014-08-08 14:10:17 +0000
@@ -95,9 +95,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
@@ -2690,7 +2691,7 @@
 
 =head1 VERSION
 
-pt-summary 2.2.9
+pt-summary 2.2.10
 
 =cut
 

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2014-07-04 17:16:08 +0000
+++ bin/pt-table-checksum	2014-08-08 14:10:17 +0000
@@ -57,7 +57,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5977,19 +5977,28 @@
    }
    my ($dbh, $repl_table) = @args{@required_args};
 
-   my $sql
-      = "SELECT CONCAT(db, '.', tbl) AS `table`, "
-      . "chunk, chunk_index, lower_boundary, upper_boundary, "
-      . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
-      . "COALESCE("
-      .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-      . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
-      . "FROM $repl_table "
-      . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
-      .        "OR ISNULL(master_crc) <> ISNULL(this_crc))"
-      . ($args{where} ? " AND ($args{where})" : "");
-   PTDEBUG && _d($sql);
-   my $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
+    
+   my $tries = $self->{'OptionParser'}->get('replicate-check-retries') || 1; 
+   my $diffs;
+   while ($tries--) {
+      my $sql
+         = "SELECT CONCAT(db, '.', tbl) AS `table`, "
+         . "chunk, chunk_index, lower_boundary, upper_boundary, "
+         . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+         . "COALESCE("
+         .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+         . "FROM $repl_table "
+         . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
+         .        "OR ISNULL(master_crc) <> ISNULL(this_crc)) "
+         . ($args{where} ? " AND ($args{where})" : "");
+      PTDEBUG && _d($sql);
+      $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
+      if (!@$diffs || !$tries) { # if no differences are found OR we are out of tries left...
+         last;                   # get out now
+      }
+      sleep 1;            
+   }
    return $diffs;
 }
 
@@ -8347,6 +8356,7 @@
 
 use strict;
 use warnings FATAL => 'all';
+use POSIX qw( ceil );
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
@@ -8512,8 +8522,8 @@
       }
       else {
          PTDEBUG && _d('Initial', $var, 'value:', $init_val);
-         $val = int(($init_val * $threshold_factor) + $init_val);
-         $vars->{$var} = $val;
+         $val = ($init_val * $threshold_factor) + $init_val;
+         $vars->{$var} = int(ceil($val));
       }
       PTDEBUG && _d('Wait if', $var, '>=', $val);
    }
@@ -8964,6 +8974,7 @@
    $print_header = 1;
    $exit_status  = 0;
 
+
    # ########################################################################
    # Get configuration information.
    # ########################################################################
@@ -10072,6 +10083,7 @@
          # Should be done automatically, but I like to be explicit.
          $fetch_sth->finish();
          $update_sth->finish();
+         $delete_sth->finish();
 
          # Update rate, chunk size, and progress if the nibble actually
          # selected some rows.
@@ -10382,6 +10394,7 @@
    return $msg ? "$ts $msg" : $ts;
 }
 
+
 sub nibble_is_safe {
    my (%args) = @_;
    my @required_args = qw(Cxn tbl NibbleIterator OptionParser);
@@ -10561,6 +10574,7 @@
 
          if (   $error =~ m/Lock wait timeout exceeded/
              || $error =~ m/Query execution was interrupted/
+             || $error =~ m/Deadlock found/
          ) {
             # These errors/warnings can be retried, so don't print
             # a warning yet; do that in final_fail.
@@ -10584,8 +10598,9 @@
          my (%args) = @_;
          my $error = $args{error};
 
-         if (   $error =~ /Lock wait timeout exceeded/
-             || $error =~ /Query execution was interrupted/
+         if (   $error =~ m/Lock wait timeout exceeded/
+             || $error =~ m/Query execution was interrupted/
+             || $error =~ m/Deadlock found/
          ) {
             # These errors/warnings are not fatal but only cause this
             # nibble to be skipped.
@@ -12287,6 +12302,15 @@
 if you run pt-table-checksum quietly in a cron job, for example, and later want
 a report on the results of the cron job, perhaps to implement a Nagios check.
 
+=item --replicate-check-retries
+
+type: int; default: 1
+
+Retry checksum comparison this many times when a difference is encountered.
+Only when a difference persists after this number of checks is it considered valid.
+Using this option with a value of 2 or more alleviates spurious differences that 
+arise when using the --resume option.
+
 =item --replicate-database
 
 type: string
@@ -12674,6 +12698,6 @@
 
 =head1 VERSION
 
-pt-table-checksum 2.2.9
+pt-table-checksum 2.2.10
 
 =cut

=== modified file 'bin/pt-table-sync'
--- bin/pt-table-sync	2014-07-04 17:16:08 +0000
+++ bin/pt-table-sync	2014-08-08 14:10:17 +0000
@@ -55,7 +55,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -12768,6 +12768,6 @@
 
 =head1 VERSION
 
-pt-table-sync 2.2.9
+pt-table-sync 2.2.10
 
 =cut

=== modified file 'bin/pt-table-usage'
--- bin/pt-table-usage	2014-07-04 17:16:08 +0000
+++ bin/pt-table-usage	2014-08-08 14:10:17 +0000
@@ -1556,12 +1556,13 @@
    my ( $class ) = @_;
    my $self = {
       pending => [],
+      last_event_offset => undef,
    };
    return bless $self, $class;
 }
 
 my $slow_log_ts_line = qr/^# Time: ([0-9: ]{15})/;
-my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]/;
+my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]\s*(?:Id:\s*(\d+))?/;
 my $slow_log_hd_line = qr{
       ^(?:
       T[cC][pP]\s[pP]ort:\s+\d+ # case differs on windows/unix
@@ -1592,6 +1593,7 @@
       or defined($stmt = $next_event->())
    ) {
       my @properties = ('cmd', 'Query', 'pos_in_log', $pos_in_log);
+      $self->{last_event_offset} = $pos_in_log;
       $pos_in_log = $tell->();
 
       if ( $stmt =~ s/$slow_log_hd_line//go ){ # Throw away header lines in log
@@ -1624,19 +1626,25 @@
                push @properties, 'ts', $time;
                ++$got_ts;
                if ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
                ) {
                   PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
                   push @properties, 'user', $user, 'host', $host, 'ip', $ip;
-                  ++$got_uh;
+                  if ( $thread_id ) {  
+                     push @properties, 'Thread_id', $thread_id;
+                 }
+                 ++$got_uh;
                }
             }
 
             elsif ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
             ) {
-               PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
-               push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+                  push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  if ( $thread_id ) {       
+                     push @properties, 'Thread_id', $thread_id;
+                 }
                ++$got_uh;
             }
 
@@ -1676,14 +1684,25 @@
 
             if ( !$found_arg && $pos == $len ) {
                PTDEBUG && _d("Did not find arg, looking for special cases");
-               local $INPUT_RECORD_SEPARATOR = ";\n";
+               local $INPUT_RECORD_SEPARATOR = ";\n";  # get next line
                if ( defined(my $l = $next_event->()) ) {
-                  chomp $l;
-                  $l =~ s/^\s+//;
-                  PTDEBUG && _d("Found admin statement", $l);
-                  push @properties, 'cmd', 'Admin', 'arg', $l;
-                  push @properties, 'bytes', length($properties[-1]);
-                  $found_arg++;
+                  if ( $l =~ /^\s*[A-Z][a-z_]+: / ) {
+                     PTDEBUG && _d("Found NULL query before", $l);
+                     local $INPUT_RECORD_SEPARATOR = ";\n#";
+                     my $rest_of_event = $next_event->();
+                     push @{$self->{pending}}, $l . $rest_of_event;
+                     push @properties, 'cmd', 'Query', 'arg', '/* No query */';
+                     push @properties, 'bytes', 0;
+                     $found_arg++;
+                  }
+                  else {
+                     chomp $l;
+                     $l =~ s/^\s+//;
+                     PTDEBUG && _d("Found admin statement", $l);
+                     push @properties, 'cmd', 'Admin', 'arg', $l;
+                     push @properties, 'bytes', length($properties[-1]);
+                     $found_arg++;
+                  }
                }
                else {
                   PTDEBUG && _d("I can't figure out what to do with this line");
@@ -1706,9 +1725,15 @@
 
       PTDEBUG && _d('Properties of event:', Dumper(\@properties));
       my $event = { @properties };
-      if ( $args{stats} ) {
-         $args{stats}->{events_read}++;
-         $args{stats}->{events_parsed}++;
+      if ( !$event->{arg} ) {
+         PTDEBUG && _d('Partial event, no arg');
+      }
+      else {
+         $self->{last_event_offset} = undef;
+         if ( $args{stats} ) {
+            $args{stats}->{events_read}++;
+            $args{stats}->{events_parsed}++;
+         }
       }
       return $event;
    } # EVENT
@@ -7536,6 +7561,6 @@
 
 =head1 VERSION
 
-pt-table-usage 2.2.9
+pt-table-usage 2.2.10
 
 =cut

=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade	2014-07-04 17:16:08 +0000
+++ bin/pt-upgrade	2014-08-08 14:10:17 +0000
@@ -61,7 +61,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6537,12 +6537,13 @@
    my ( $class ) = @_;
    my $self = {
       pending => [],
+      last_event_offset => undef,
    };
    return bless $self, $class;
 }
 
 my $slow_log_ts_line = qr/^# Time: ([0-9: ]{15})/;
-my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]/;
+my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]\s*(?:Id:\s*(\d+))?/;
 my $slow_log_hd_line = qr{
       ^(?:
       T[cC][pP]\s[pP]ort:\s+\d+ # case differs on windows/unix
@@ -6573,6 +6574,7 @@
       or defined($stmt = $next_event->())
    ) {
       my @properties = ('cmd', 'Query', 'pos_in_log', $pos_in_log);
+      $self->{last_event_offset} = $pos_in_log;
       $pos_in_log = $tell->();
 
       if ( $stmt =~ s/$slow_log_hd_line//go ){ # Throw away header lines in log
@@ -6605,19 +6607,25 @@
                push @properties, 'ts', $time;
                ++$got_ts;
                if ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
                ) {
                   PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
                   push @properties, 'user', $user, 'host', $host, 'ip', $ip;
-                  ++$got_uh;
+                  if ( $thread_id ) {  
+                     push @properties, 'Thread_id', $thread_id;
+                 }
+                 ++$got_uh;
                }
             }
 
             elsif ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
             ) {
-               PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
-               push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+                  push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  if ( $thread_id ) {       
+                     push @properties, 'Thread_id', $thread_id;
+                 }
                ++$got_uh;
             }
 
@@ -6698,9 +6706,15 @@
 
       PTDEBUG && _d('Properties of event:', Dumper(\@properties));
       my $event = { @properties };
-      if ( $args{stats} ) {
-         $args{stats}->{events_read}++;
-         $args{stats}->{events_parsed}++;
+      if ( !$event->{arg} ) {
+         PTDEBUG && _d('Partial event, no arg');
+      }
+      else {
+         $self->{last_event_offset} = undef;
+         if ( $args{stats} ) {
+            $args{stats}->{events_read}++;
+            $args{stats}->{events_parsed}++;
+         }
       }
       return $event;
    } # EVENT
@@ -11224,6 +11238,6 @@
 
 =head1 VERSION
 
-pt-upgrade 2.2.9
+pt-upgrade 2.2.10
 
 =cut

=== modified file 'bin/pt-variable-advisor'
--- bin/pt-variable-advisor	2014-07-04 17:16:08 +0000
+++ bin/pt-variable-advisor	2014-08-08 14:10:17 +0000
@@ -44,7 +44,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6138,6 +6138,6 @@
 
 =head1 VERSION
 
-pt-variable-advisor 2.2.9
+pt-variable-advisor 2.2.10
 
 =cut

=== modified file 'bin/pt-visual-explain'
--- bin/pt-visual-explain	2014-07-04 17:16:08 +0000
+++ bin/pt-visual-explain	2014-08-08 14:10:17 +0000
@@ -3243,6 +3243,6 @@
 
 =head1 VERSION
 
-pt-visual-explain 2.2.9
+pt-visual-explain 2.2.10
 
 =cut

=== modified file 'config/deb/changelog'
--- config/deb/changelog	2014-07-08 12:06:12 +0000
+++ config/deb/changelog	2014-08-08 14:10:17 +0000
@@ -1,3 +1,14 @@
+percona-toolkit (2.2.10) unstable; urgency=low
+
+  * Fixed bug 1287253: pt-table-checksum deadlock 
+  * Fixed bug 1299387: 5.6 slow query log Thead_id becomes Id
+  * Fixed bug 1311654: pt-table-checksum + PXC inconsistent results upon --resume
+  * Fixed bug 1340728: pt-online-schema-change doesn't work with HASH indexes
+  * Fixed bug 1253872: pt-table-checksum max load 20% rounds down
+  * Fixed bug 1340364: some shell tools output error when queried for --version 
+
+ -- Percona Toolkit Developers <[e-mail]>  Wed, 06 Aug 2014 19:53:53 +0000
+
 percona-toolkit (2.2.9) unstable; urgency=low
 
   * Fixed bug 1258135: pt-deadlock-logger introduces a noise to MySQL

=== modified file 'config/sphinx-build/conf.py'
--- config/sphinx-build/conf.py	2014-07-08 12:06:12 +0000
+++ config/sphinx-build/conf.py	2014-08-08 14:10:17 +0000
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.9'
+release = '2.2.10'
 
 # 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-07-08 12:06:12 +0000
+++ docs/percona-toolkit.pod	2014-08-08 14:10:17 +0000
@@ -557,6 +557,6 @@
 
 =head1 VERSION
 
-Percona Toolkit v2.2.9 released 2014-07-08
+Percona Toolkit v2.2.10 released 2014-08-06
 
 =cut

=== modified file 'docs/release_notes.rst'
--- docs/release_notes.rst	2014-07-08 12:06:12 +0000
+++ docs/release_notes.rst	2014-08-08 14:10:17 +0000
@@ -1,6 +1,35 @@
 Release Notes
 *************
 
+v2.2.10 released 2014-08-06
+===========================
+
+Percona Toolkit 2.2.10 has been released. This release contains six bug fixes.
+
+Bugs Fixed:
+
+* Fixed bug 1287253: pt-table-checksum would exit with error if it would encounter deadlock when doing checksum. This was fixed by retrying the command in case of deadlock error.
+
+* Fixed bug 1311654: When used with Percona XtraDB Cluster, pt-table-checksum could show incorrect result if --resume option was used. This was fixed by adding a new ``--replicate-check-retries`` command line parameter. If you are having resume problems you can now set ``--replicate-check-retries`` N , where N is the number of times to retry a discrepant checksum (default = 1 , no retries). Setting a value of ``3`` is enough to completely eliminate spurious differences.
+
+* Fixed bug 1299387: pt-query-digest didn't work correctly do to a changed logging format when field ``Thread_id`` has been renamed to ``Id``. Fixed by implementing support for the new format.
+
+* Fixed bug 1340728: in some cases, where the index was of type "hash" , pt-online-schema-change would refuse to run because MySQL reported it would not use an index for the select. This check should have been able to be skipped using --nocheck-plan option, but it wasn't. ``--nocheck-plan`` now ignores the chosen index correctly.
+
+* Fixed bug 1253872: When running pt-table-checksum or pt-online-schema on a server that is unused, setting the 20% max load would fail due to tools rounding the value down. This has been fixed by rounding the value up.
+
+* Fixed bug 1340364: Due to incompatibility of dash and bash syntax some shell tools were showing error when queried for version.
+
+Changelog
+---------
+
+* Fixed bug 1287253: pt-table-checksum deadlock 
+* Fixed bug 1299387: 5.6 slow query log Thead_id becomes Id
+* Fixed bug 1311654: pt-table-checksum + PXC inconsistent results upon --resume
+* Fixed bug 1340728: pt-online-schema-change doesn't work with HASH indexes
+* Fixed bug 1253872: pt-table-checksum max load 20% rounds down
+* Fixed bug 1340364: some shell tools output error when queried for --version 
+
 v2.2.9 released 2014-07-08
 ==========================
 

=== modified file 'lib/MySQLStatusWaiter.pm'
--- lib/MySQLStatusWaiter.pm	2013-01-03 00:19:16 +0000
+++ lib/MySQLStatusWaiter.pm	2014-08-08 14:10:17 +0000
@@ -24,6 +24,7 @@
 
 use strict;
 use warnings FATAL => 'all';
+use POSIX qw( ceil );
 use English qw(-no_match_vars);
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
@@ -221,8 +222,8 @@
       }
       else {
          PTDEBUG && _d('Initial', $var, 'value:', $init_val);
-         $val = int(($init_val * $threshold_factor) + $init_val);
-         $vars->{$var} = $val;
+         $val = ($init_val * $threshold_factor) + $init_val;
+         $vars->{$var} = int(ceil($val));
       }
       PTDEBUG && _d('Wait if', $var, '>=', $val);
    }

=== modified file 'lib/Percona/Toolkit.pm'
--- lib/Percona/Toolkit.pm	2014-07-04 16:13:38 +0000
+++ lib/Percona/Toolkit.pm	2014-08-08 14:10:17 +0000
@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;
 
-our $VERSION = '2.2.9';
+our $VERSION = '2.2.10';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'lib/RowChecksum.pm'
--- lib/RowChecksum.pm	2013-01-03 00:19:16 +0000
+++ lib/RowChecksum.pm	2014-08-08 14:10:17 +0000
@@ -459,19 +459,28 @@
    }
    my ($dbh, $repl_table) = @args{@required_args};
 
-   my $sql
-      = "SELECT CONCAT(db, '.', tbl) AS `table`, "
-      . "chunk, chunk_index, lower_boundary, upper_boundary, "
-      . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
-      . "COALESCE("
-      .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-      . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
-      . "FROM $repl_table "
-      . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
-      .        "OR ISNULL(master_crc) <> ISNULL(this_crc))"
-      . ($args{where} ? " AND ($args{where})" : "");
-   PTDEBUG && _d($sql);
-   my $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
+    
+   my $tries = $self->{'OptionParser'}->get('replicate-check-retries') || 1; 
+   my $diffs;
+   while ($tries--) {
+      my $sql
+         = "SELECT CONCAT(db, '.', tbl) AS `table`, "
+         . "chunk, chunk_index, lower_boundary, upper_boundary, "
+         . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+         . "COALESCE("
+         .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+         . "FROM $repl_table "
+         . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
+         .        "OR ISNULL(master_crc) <> ISNULL(this_crc)) "
+         . ($args{where} ? " AND ($args{where})" : "");
+      PTDEBUG && _d($sql);
+      $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
+      if (!@$diffs || !$tries) { # if no differences are found OR we are out of tries left...
+         last;                   # get out now
+      }
+      sleep 1;            
+   }
    return $diffs;
 }
 

=== modified file 'lib/SlowLogParser.pm'
--- lib/SlowLogParser.pm	2013-05-08 03:19:37 +0000
+++ lib/SlowLogParser.pm	2014-08-08 14:10:17 +0000
@@ -42,7 +42,7 @@
 }
 
 my $slow_log_ts_line = qr/^# Time: ([0-9: ]{15})/;
-my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]/;
+my $slow_log_uh_line = qr/# User\@Host: ([^\[]+|\[[^[]+\]).*?@ (\S*) \[(.*)\]\s*(?:Id:\s*(\d+))?/;
 # These can appear in the log file when it's opened -- for example, when someone
 # runs FLUSH LOGS or the server starts.
 # /usr/sbin/mysqld, Version: 5.0.67-0ubuntu6-log ((Ubuntu)). started with:
@@ -159,21 +159,29 @@
                ++$got_ts;
                # The User@Host might be concatenated onto the end of the Time.
                if ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
                ) {
                   PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
                   push @properties, 'user', $user, 'host', $host, 'ip', $ip;
-                  ++$got_uh;
+                  # 5.6 has the thread id on the User@Host line
+                  if ( $thread_id ) {  
+                     push @properties, 'Thread_id', $thread_id;
+                 }
+                 ++$got_uh;
                }
             }
 
             # Maybe it's the user/host line of a slow query log
             # # User@Host: root[root] @ localhost []
             elsif ( !$got_uh
-                  && ( my ( $user, $host, $ip ) = $line =~ m/$slow_log_uh_line/o )
+                  && ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
             ) {
-               PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
-               push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
+                  push @properties, 'user', $user, 'host', $host, 'ip', $ip;
+                  # 5.6 has the thread id on the User@Host line
+                  if ( $thread_id ) {       
+                     push @properties, 'Thread_id', $thread_id;
+                 }
                ++$got_uh;
             }
 

=== modified file 'lib/bash/parse_options.sh'
--- lib/bash/parse_options.sh	2013-08-09 21:21:55 +0000
+++ lib/bash/parse_options.sh	2014-08-08 14:10:17 +0000
@@ -76,9 +76,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

=== modified file 't/lib/MySQLStatusWaiter.t'
--- t/lib/MySQLStatusWaiter.t	2012-05-25 21:27:23 +0000
+++ t/lib/MySQLStatusWaiter.t	2014-08-08 14:10:17 +0000
@@ -8,6 +8,7 @@
 
 use strict;
 use warnings FATAL => 'all';
+use POSIX qw( ceil floor );
 use English qw(-no_match_vars);
 use Test::More tests => 17;
 
@@ -19,6 +20,7 @@
 my $slept   = 0;
 my @vals    = ();
 
+
 sub oktorun {
    return $oktorun;
 }
@@ -76,33 +78,35 @@
    "Catch non-existent variable"
 );
 
-# ############################################################################
-# Use initial vals + 20%.
-# ############################################################################
+
+# ############################################################################
+# Initial vals + 20% 
+# ############################################################################
+
 @vals = (
    # initial check for existence
-   { Threads_connected => 10, },
-   { Threads_running   => 5,  },
+   { Threads_connected => 9, },
+   { Threads_running   => 4,  },
 
    # first check, no wait
    { Threads_connected => 1, },
    { Threads_running   => 1, },
 
    # second check, wait
-   { Threads_connected => 12, }, # too high
-   { Threads_running   => 6,  }, # too high
+   { Threads_connected => 11, }, # too high
+   { Threads_running   => 5,  }, # too high
 
    # third check, wait
-   { Threads_connected => 12, }, # too high
-   { Threads_running   => 5,  },
+   { Threads_connected => 11, }, # too high
+   { Threads_running   => 4,  }, 
 
    # fourth check, wait
    { Threads_connected => 10, },
-   { Threads_running   => 6,  }, # too high
+   { Threads_running   => 5,  }, # too high
    
    # fifth check, no wait
    { Threads_connected => 10, },
-   { Threads_running   => 5,  },
+   { Threads_running   => 4,  },
 );
 
 $oktorun = 1;
@@ -117,10 +121,10 @@
 is_deeply(
    $sw->max_values(),
    {
-      Threads_connected => int(10 + (10 * 0.20)),
-      Threads_running   => int(5  + (5  * 0.20)),
+      Threads_connected => ceil(9 + (9 * 0.20)),
+      Threads_running   => ceil(4  + (4  * 0.20)),
    },
-   "Initial values +20%"
+   "Threshold = ceil(InitialValue * 1.2)"
 );
 
 # first check

=== modified file 't/lib/SlowLogParser.t'
--- t/lib/SlowLogParser.t	2012-12-11 01:07:36 +0000
+++ t/lib/SlowLogParser.t	2014-08-08 14:10:17 +0000
@@ -1349,6 +1349,70 @@
    ],
 );
 
+
+# #############################################################################
+# pt-query-digest fails to parse Thread_id on 5.6 
+# https://bugs.launchpad.net/percona-toolkit/+bug/1299387
+# #############################################################################
+
+# first test with a Percona 5.5 slow log (includes an explicit Thread_id line)
+# (MySQL 5.5 doesn't include thread id)
+test_log_parser(
+   parser => $p,
+   file   => "$sample/slow060.txt",
+   result => [
+      {  
+        Thread_id     => '1',     # here's our item
+        Bytes_sent    => '64',
+        Killed        => '0',
+        Last_errno    => '0',
+        Lock_time     => '0.000000',
+        Query_time    => '10.000373',
+        Rows_affected => '0',
+        Rows_examined => '0',
+        Rows_read     => '0',
+        Rows_sent     => '1',
+        arg           => 'select sleep(10)',
+        bytes         => 16,
+        cmd           => 'Query',
+        host          => 'localhost',
+        ip            => '127.0.0.1',
+        pos_in_log    => 0,
+        timestamp     => '1405358212',
+        ts            => '140714 14:16:52',
+        user          => 'root'
+      },
+   ],
+);
+
+# now test with a Percona 5.6 slow log. Thread_id is now on the user@host line, and is called 'Id'.
+# (this is in line with MySQL 5.6)
+test_log_parser(
+   parser => $p,
+   file   => "$sample/slow061.txt",
+   result => [
+      {  
+         Thread_id     => 1,           # here's our item
+         Bytes_sent    => '64',
+         Lock_time     => '0.000000',
+         Query_time    => '11.013723',
+         Rows_affected => '0',
+         Rows_examined => '0',
+         Rows_sent     => '1',
+         arg           => 'select sleep(11)',
+         bytes         => 16,
+         cmd           => 'Query',
+         host          => 'localhost',
+         ip            => '127.0.0.1',
+         pos_in_log    => 0,
+         timestamp     => '1405360304',
+         ts            => '140714 14:51:44',
+         user          => 'root',
+      },
+   ],
+);
+
+
 # #############################################################################
 # Done.
 # #############################################################################

=== added file 't/lib/samples/slowlogs/slow060.txt'
--- t/lib/samples/slowlogs/slow060.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/slowlogs/slow060.txt	2014-08-08 14:10:17 +0000
@@ -0,0 +1,10 @@
+bin/mysqld, Version: 5.5.38-35.2-log (Percona Server (GPL), Release 35.2, Revision 674). started with:
+Tcp port: 3306  Unix socket: (null)
+Time                 Id Command    Argument
+# Time: 140714 14:16:52
+# User@Host: root[root] @ localhost [127.0.0.1]
+# Thread_id: 1  Schema:   Last_errno: 0  Killed: 0
+# Query_time: 10.000373  Lock_time: 0.000000  Rows_sent: 1  Rows_examined: 0  Rows_affected: 0  Rows_read: 0
+# Bytes_sent: 64
+SET timestamp=1405358212;
+select sleep(10);

=== added file 't/lib/samples/slowlogs/slow061.txt'
--- t/lib/samples/slowlogs/slow061.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/slowlogs/slow061.txt	2014-08-08 14:10:17 +0000
@@ -0,0 +1,10 @@
+bin/mysqld, Version: 5.6.19-67.0-log (Percona Server (GPL), Release 67.0, Revision 618). started with:
+Tcp port: 3306  Unix socket: (null)
+Time                 Id Command    Argument
+# Time: 140714 14:51:44
+# User@Host: root[root] @ localhost [127.0.0.1]  Id:     1
+# Schema:   Last_errno: 0  Killed: 0
+# Query_time: 11.013723  Lock_time: 0.000000  Rows_sent: 1  Rows_examined: 0  Rows_affected: 0
+# Bytes_sent: 64
+SET timestamp=1405360304;
+select sleep(11);

=== removed file 't/pt-online-schema-change/bug-1315130.t'
--- t/pt-online-schema-change/bug-1315130.t	2014-06-20 21:31:30 +0000
+++ t/pt-online-schema-change/bug-1315130.t	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use Time::HiRes qw(sleep);
-
-$ENV{PTTEST_FAKE_TS} = 1;
-$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
-
-use PerconaTest;
-use Sandbox;
-require "$trunk/bin/pt-online-schema-change";
-require VersionParser;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
-
-my $dp         = new DSNParser(opts=>$dsn_opts);
-my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
-
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
-}
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
-}
-
-my $q      = new Quoter();
-my $tp     = new TableParser(Quoter => $q);
-my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
-my $output = "";
-my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
-my $exit   = 0;
-my $sample = "t/pt-online-schema-change/samples";
-my $rows;
-
-
-# #############################################################################
-# Issue 1315130
-# Failed to detect child tables in other schema, and falsely identified
-# child tables in own schema
-# #############################################################################
-
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
-$sb->load_file('master', "$sample/bug-1315130.sql");
-($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$dsn,D=bug_1315130_a,t=parent_table",
-         '--dry-run', 
-         '--alter', "add column c varchar(16)",
-         '--alter-foreign-keys-method', 'auto'),
-      },
-);
-print STDERR "[$output]\n";
-   like(
-         $output,
-         qr/Child tables:\s*`bug_1315130_a`\.`child_table_in_same_schema` \(approx\. 1 rows\)\s*`bug_1315130_b`\.`child_table_in_second_schema` \(approx\. 1 rows\)[^`]*?Will/s,
-         "Correctly identify child tables from other schemas and ignores tables from same schema referencig same named parent in other schema.",
-   );
-# clear databases with their foreign keys
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");  
-
-# Done.
-# #############################################################################
-$sb->wipe_clean($master_dbh);
-ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-done_testing;

=== modified file 't/pt-online-schema-change/bugs.t'
--- t/pt-online-schema-change/bugs.t	2013-06-26 20:28:27 +0000
+++ t/pt-online-schema-change/bugs.t	2014-08-08 14:10:17 +0000
@@ -124,7 +124,11 @@
 {
    my $o = new OptionParser(file => "$trunk/bin/pt-table-checksum");
    $o->get_specs();
+
+   $o->set('check-plan', 1);  #  check-plan is true by default
+
    no warnings;
+
    local *pt_online_schema_change::explain_statement = sub {
       return { key => 'some_key' }
    };
@@ -369,6 +373,66 @@
    "Bug 1188264: warning about expected MySQL error 1265"
 );
 
+
+# #############################################################################
+# Issue 1315130
+# Failed to detect child tables in other schema, and falsely identified
+# child tables in own schema
+# #############################################################################
+
+$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
+$sb->load_file('master', "$sample/bug-1315130.sql");
+
+$output = output(
+   sub { pt_online_schema_change::main(@args, "$master_dsn,D=bug_1315130_a,t=parent_table",
+         '--dry-run', 
+         '--alter', "add column c varchar(16)",
+         '--alter-foreign-keys-method', 'auto'),
+      },
+);
+
+   like(
+         $output,
+         qr/Child tables:\s*`bug_1315130_a`\.`child_table_in_same_schema` \(approx\. 1 rows\)\s*`bug_1315130_b`\.`child_table_in_second_schema` \(approx\. 1 rows\)[^`]*?Will/s,
+         "Correctly identify child tables from other schemas and ignores tables from same schema referencig same named parent in other schema.",
+   );
+# clear databases with their foreign keys
+$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");  
+
+
+# #############################################################################
+# Issue 1340728
+# fails when no index is returned in EXPLAIN,  even though --nocheck-plan is set
+# (happens on HASH indexes)
+# #############################################################################
+
+$sb->load_file('master', "$sample/bug-1340728_cleanup.sql");
+$sb->load_file('master', "$sample/bug-1340728.sql");
+
+# insert a few thousand rows (else test isn't valid)
+my $rows = 5000;
+for (my $i = 0; $i < $rows; $i++) {
+   $master_dbh->do("INSERT INTO bug_1340728.test VALUES (NULL, 'xx')");
+}
+
+
+$output = output(
+   sub { pt_online_schema_change::main(@args, "$master_dsn,D=bug_1340728,t=test",
+         '--execute', 
+         '--alter', "ADD COLUMN c INT",
+         '--nocheck-plan',
+         ),
+      },
+);
+
+   like(
+         $output,
+         qr/Successfully altered/s,
+         "--nocheck-plan ignores plans without index",
+   );
+# clear databases 
+$sb->load_file('master', "$sample/bug-1340728_cleanup.sql");  
+
 # #############################################################################
 # Done.
 # #############################################################################

=== added file 't/pt-online-schema-change/samples/bug-1340728.sql'
--- t/pt-online-schema-change/samples/bug-1340728.sql	1970-01-01 00:00:00 +0000
+++ t/pt-online-schema-change/samples/bug-1340728.sql	2014-08-08 14:10:17 +0000
@@ -0,0 +1,10 @@
+drop database if exists bug_1340728;
+create database bug_1340728;
+use bug_1340728;
+
+CREATE TABLE `test` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(2) NOT NULL,
+  PRIMARY KEY (`id`) USING HASH
+) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+

=== added file 't/pt-online-schema-change/samples/bug-1340728_cleanup.sql'
--- t/pt-online-schema-change/samples/bug-1340728_cleanup.sql	1970-01-01 00:00:00 +0000
+++ t/pt-online-schema-change/samples/bug-1340728_cleanup.sql	2014-08-08 14:10:17 +0000
@@ -0,0 +1,2 @@
+drop database if exists bug_1340728;
+

=== modified file 't/pt-query-digest/since_until.t'
--- t/pt-query-digest/since_until.t	2013-03-05 16:59:33 +0000
+++ t/pt-query-digest/since_until.t	2014-08-08 14:10:17 +0000
@@ -52,16 +52,16 @@
    '--since 090727'
 );
 
-# This test will fail come July 2014.
+# This test will fail come July 2015.
 ok(
    no_diff(
       sub { pt_query_digest::main(@args,
-         "$sample_in/slow033.txt", qw(--since 1825d),
+         "$sample_in/slow033.txt", qw(--since 2190d),
       )},
       "t/pt-query-digest/samples/slow033-since-Nd.txt",
       stderr => 1,
    ),
-   '--since 1825d (5 years ago)'
+   '--since 2190d (6 years ago)'
 );
 
 # --until

=== modified file 't/pt-table-checksum/basics.t'
--- t/pt-table-checksum/basics.t	2014-07-07 00:43:50 +0000
+++ t/pt-table-checksum/basics.t	2014-08-08 14:10:17 +0000
@@ -80,8 +80,8 @@
 # other than to ensure that there's at least one for each table.
 $row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 ok(
-   $row->[0] > 30 && $row->[0] < 50,
-   'Between 30 and 50 chunks'
+   $row->[0] > 30 && $row->[0] < 60,
+   'Between 30 and 60 chunks'
 ) or diag($row->[0]);
 
 # ############################################################################
@@ -97,6 +97,7 @@
    "Static chunk size (--chunk-time 0)"
 );
 
+
 $row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 ok(
    $row->[0] >= 85 && $row->[0] <= 90,

=== modified file 't/pt-table-checksum/samples/default-results-5.5.txt'
--- t/pt-table-checksum/samples/default-results-5.5.txt	2013-02-19 01:51:14 +0000
+++ t/pt-table-checksum/samples/default-results-5.5.txt	2014-08-08 14:10:17 +0000
@@ -21,7 +21,7 @@
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
 0 0 2 0 mysql.user
-0 0 38 0 percona_test.checksums
+0 0 22 0 percona_test.checksums
 0 0 1 0 percona_test.load_data
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/default-results-5.6.txt'
--- t/pt-table-checksum/samples/default-results-5.6.txt	2013-02-19 01:51:44 +0000
+++ t/pt-table-checksum/samples/default-results-5.6.txt	2014-08-08 14:10:17 +0000
@@ -20,7 +20,7 @@
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
 0 0 2 0 mysql.user
-0 0 37 0 percona_test.checksums
+0 0 22 0 percona_test.checksums
 0 0 1 0 percona_test.load_data
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/static-chunk-size-results-5.5.txt'
--- t/pt-table-checksum/samples/static-chunk-size-results-5.5.txt	2013-02-19 01:51:14 +0000
+++ t/pt-table-checksum/samples/static-chunk-size-results-5.5.txt	2014-08-08 14:10:17 +0000
@@ -21,7 +21,7 @@
 0 0 0 1 0 mysql.time_zone_transition
 0 0 0 1 0 mysql.time_zone_transition_type
 0 0 2 1 0 mysql.user
-0 0 38 1 0 percona_test.checksums
+0 0 22 1 0 percona_test.checksums
 0 0 1 1 0 percona_test.load_data
 0 0 1 1 0 percona_test.sentinel
 0 0 200 1 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/static-chunk-size-results-5.6.txt'
--- t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt	2013-02-19 01:51:44 +0000
+++ t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt	2014-08-08 14:10:17 +0000
@@ -20,7 +20,7 @@
 0 0 0 1 0 mysql.time_zone_transition
 0 0 0 1 0 mysql.time_zone_transition_type
 0 0 2 1 0 mysql.user
-0 0 37 1 0 percona_test.checksums
+0 0 22 1 0 percona_test.checksums
 0 0 1 1 0 percona_test.load_data
 0 0 1 1 0 percona_test.sentinel
 0 0 200 1 0 sakila.actor