Merge lp:~percona-toolkit-dev/percona-toolkit/mysql-5.6-test-fixes into lp:percona-toolkit/2.2

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/mysql-5.6-test-fixes]

504. By Daniel Nichter on 2012-12-13

Add /usr/local/bin to PATH in jenkins-test.

505. By Brian Fraser on 2012-12-14

Added two missing config files fort/pt-config-diff/basics.t

506. By Brian Fraser on 2012-12-14

Merged pxc-pt-heartbeat

507. By Brian Fraser on 2012-12-14

Merged fix-886059-pt-heartbeat-timezones

508. By Brian Fraser on 2012-12-14

Merged fix-1082104-pt-deadlock-logger-username-dash

509. By Daniel Nichter on 2012-12-14

Set USER=jenkins if not set in util/jenkins-test.

510. By Daniel Nichter on 2012-12-14

Fix two possible sources of test errors.

511. By Daniel Nichter on 2012-12-14

Only run pt-ioprofile.t if the system has strace.

512. By Daniel Nichter on 2012-12-15

Add REFETCH_MYSQL to jenkins-test.

513. By Daniel Nichter on 2012-12-15

Fix REFETCH_MYSQL.

514. By Brian Fraser on 2012-12-19

Merged mysql-5.6-test-fixes and resolved conflicts

515. By Brian Fraser on 2012-12-19

pt-deadlock-logger: InnoDB timestamps have a different format in 5.6

516. By Brian Fraser on 2012-12-19

t/pt-heartbeat/bugs.t: Wait for test.heartbeat in slave1 before testing

517. By Brian Fraser on 2012-12-20

pt-deadlock-logger: use a character class instead of \p{Hex}

518. By Brian Fraser on 2012-12-20

pt-fk-error-logger: Deal with 5.6 InnoDB timestamps

519. By Brian Fraser on 2012-12-20

t/pt-find/pt-find.t: Update plan

520. By Daniel Nichter on 2012-12-20

Merge 2.1 r514, just a doc change.

521. By Daniel Nichter on 2012-12-20

Remove ndb_binlog_index from auto-skipped sys tables in SchemaIterator because it wasn't previously skipped in 5.1 and 5.5.

522. By Daniel Nichter on 2012-12-20

Update SchemaIterator.t sample files.

523. By Daniel Nichter on 2012-12-20

Make timing test more reasonable on fast systems.

[Daniel Nichter (daniel-nichter)]

Post-merge approval.

review: Approve

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2012-12-03 03:48:11 +0000
+++ bin/pt-deadlock-logger	2012-12-20 23:20:32 +0000
@@ -3757,8 +3757,9 @@
 my $t  = qr/((?:\d+ \d+)|(?:[A-Fa-f0-9]+))/;                # Transaction ID
 my $i = qr/((?:\d{1,3}\.){3}\d+)/;    # IP address
 my $n = qr/([^`\s]+)/;                # MySQL object name
-my $w = qr/(\w+)/;                    # Words
-my $s = qr/(\d{6} .\d:\d\d:\d\d)/;    # InnoDB timestamp
+my $u = qr/(\S+)/;                    # Username. This is somewhat wrong, but
+                                      # usernames with spaces are rare enough.
+my $s = qr/((?:\d{6}|\d{4}-\d\d-\d\d) .\d:\d\d:\d\d)(?: [A-Fa-f0-9]+)?/;    # InnoDB timestamp
 
 # A thread's proc_info can be at least 98 different things I've found in the
 # source.  Fortunately, most of them begin with a gerunded verb.  These are
@@ -4082,7 +4083,7 @@
                # the most useful marker for where I have to start guessing.
                ( $hostname, $ip ) = $thread_line =~ m/query id \d+(?: ([A-Za-z]\S+))? $i/m;
                if ( defined $ip ) {
-                  ($user, $query_status) = $thread_line =~ m/$ip $w(?: (.*))?$/;
+                  ($user, $query_status) = $thread_line =~ m/$ip $u(?: (.*))?$/;
                }
                else {
                   # OK, there wasn't an IP address.
@@ -4094,7 +4095,7 @@
                      # query_status.
                      # It's basically impossible to know which is which.
                      ( $hostname, $user, $query_status ) = $thread_line
-                        =~ m/query id \d+(?: ([A-Za-z]\S+))?(?: $w(?: (.*))?)?$/m;
+                        =~ m/query id \d+(?: ([A-Za-z]\S+))?(?: $u(?: (.*))?)?$/m;
                   }
                   else {
                      $user = 'system user';
@@ -4139,8 +4140,11 @@
 
    # Extract some miscellaneous data from the deadlock.
    my ( $ts ) = $dl_text =~ m/^$s$/m;
-   my ( $year, $mon, $day, $hour, $min, $sec ) = $ts =~ m/^(\d\d)(\d\d)(\d\d) +(\d+):(\d+):(\d+)$/;
-   $ts = sprintf('%02d-%02d-%02dT%02d:%02d:%02d', $year + 2000, $mon, $day, $hour, $min, $sec);
+   my ( $year, $mon, $day, $hour, $min, $sec ) = $ts =~ m/^((?:\d\d)?\d\d)-?(\d\d)-?(\d\d) +(\d+):(\d+):(\d+)$/;
+   if ( length($year) == 2 ) {
+      $year += 2000;
+   }
+   $ts = sprintf('%02d-%02d-%02dT%02d:%02d:%02d', $year, $mon, $day, $hour, $min, $sec);
    my ( $victim ) = $dl_text =~ m/^\*\*\* WE ROLL BACK TRANSACTION \((\d+)\)$/m;
    $victim ||= 0;
 
@@ -4387,6 +4391,10 @@
 both wait-for locks and get more information.  If the two waited-for locks are
 not on the same table, more than two transactions were involved in the deadlock.
 
+Finally, keep in mind that, because usernames with spaces are not quoted by
+InnoDB, the tool will generally misreport the second word of these usernames
+as the hostname.
+
 =head1 OPTIONS
 
 This tool accepts additional command-line arguments.  Refer to the

=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2012-12-03 03:48:11 +0000
+++ bin/pt-duplicate-key-checker	2012-12-20 23:20:32 +0000
@@ -3026,11 +3026,16 @@
 
    if ( !$self->{initialized} ) {
       $self->{initialized} = 1;
-      if ( $self->{resume}->{tbl}
-           && !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
-         PTDEBUG && _d('Will resume after',
-            join('.', @{$self->{resume}}{qw(db tbl)}));
-         $self->{resume}->{after} = 1;
+      if ( $self->{resume}->{tbl} ) {
+         if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
+            PTDEBUG && _d('Will resume after',
+               join('.', @{$self->{resume}}{qw(db tbl)}));
+            $self->{resume}->{after}->{tbl} = 1;
+         }
+         if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
+            PTDEBUG && _d('Will resume after', $self->{resume}->{db});
+            $self->{resume}->{after}->{db}  = 1;
+         }
       }
    }
 
@@ -3128,16 +3133,17 @@
    if ( !defined $self->{dbs} ) {
       my $sql = 'SHOW DATABASES';
       PTDEBUG && _d($sql);
-      my @dbs = grep { $self->database_is_allowed($_) }
-                @{$dbh->selectcol_arrayref($sql)};
+      my @dbs = grep {
+                  $self->_resume_from_database($_)
+                  &&
+                  $self->database_is_allowed($_)
+                } @{$dbh->selectcol_arrayref($sql)};
       PTDEBUG && _d('Found', scalar @dbs, 'databases');
       $self->{dbs} = \@dbs;
    }
 
    if ( !$self->{db} ) {
-      do {
-         $self->{db} = shift @{$self->{dbs}};
-      } until $self->_resume_from_database($self->{db});
+      $self->{db} = shift @{$self->{dbs}};
       PTDEBUG && _d('Next database:', $self->{db});
       return unless $self->{db};
    }
@@ -3239,9 +3245,15 @@
 
    my $filter = $self->{filters};
 
-   if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
-      return 0;
-   }
+   return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
+       general_log
+      |slow_log
+      |innodb_index_stats
+      |innodb_table_stats
+      |slave_master_info
+      |slave_relay_log_info
+      |slave_worker_info
+   )$/x;
 
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'
@@ -3310,11 +3322,17 @@
    my ($self, $db) = @_;
 
    return 1 unless $self->{resume}->{db};
-
    if ( $db eq $self->{resume}->{db} ) {
-      PTDEBUG && _d('At resume db', $db);
-      delete $self->{resume}->{db};
-      return 1;
+      if ( !$self->{resume}->{after}->{db} ) {
+         PTDEBUG && _d('Resuming from db', $db);
+         delete $self->{resume}->{db};
+         return 1;
+      }
+      else {
+         PTDEBUG && _d('Resuming after db', $db);
+         delete $self->{resume}->{db};
+         delete $self->{resume}->{tbl};
+      }
    }
 
    return 0;
@@ -3326,7 +3344,7 @@
    return 1 unless $self->{resume}->{tbl};
 
    if ( $tbl eq $self->{resume}->{tbl} ) {
-      if ( !$self->{resume}->{after} ) {
+      if ( !$self->{resume}->{after}->{tbl} ) {
          PTDEBUG && _d('Resuming from table', $tbl);
          delete $self->{resume}->{tbl};
          return 1;

=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger	2012-12-03 03:48:11 +0000
+++ bin/pt-fk-error-logger	2012-12-20 23:20:32 +0000
@@ -1942,6 +1942,9 @@
                      . (defined $f ? '%09.6f' : '%02d'),
                      $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
    }
+   elsif ( $val =~ m/^$proper_ts$/ ) {
+      return $val;
+   }
    return $val;
 }
 
@@ -3609,7 +3612,8 @@
    # Quick check if text even has a foreign key error.
    return unless $text =~ m/LATEST FOREIGN KEY ERROR/;
 
-   my $idb_ts = qr/(\d{6} .\d:\d\d:\d\d)/;    # InnoDB timestamp
+   # InnoDB timestamp
+   my $idb_ts = qr/((?:\d{6}|\d{4}-\d\d-\d\d) .\d:\d\d:\d\d)/;
 
    my ($ts, $fke) = $text =~ m/LATEST FOREIGN KEY ERROR.+?$idb_ts\s*(.+?)---/ms;
    chomp $fke if $fke;

=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2012-12-03 03:48:11 +0000
+++ bin/pt-heartbeat	2012-12-20 23:20:32 +0000
@@ -20,6 +20,7 @@
       Daemon
       Quoter
       TableParser
+      Retry
       Transformers
       VersionCheck
       HTTPMicro
@@ -2921,6 +2922,84 @@
 # ###########################################################################
 
 # ###########################################################################
+# Retry package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/Retry.pm
+#   t/lib/Retry.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package Retry;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+sub new {
+   my ( $class, %args ) = @_;
+   my $self = {
+      %args,
+   };
+   return bless $self, $class;
+}
+
+sub retry {
+   my ( $self, %args ) = @_;
+   my @required_args = qw(try fail final_fail);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my ($try, $fail, $final_fail) = @args{@required_args};
+   my $wait  = $args{wait}  || sub { sleep 1; };
+   my $tries = $args{tries} || 3;
+
+   my $last_error;
+   my $tryno = 0;
+   TRY:
+   while ( ++$tryno <= $tries ) {
+      PTDEBUG && _d("Try", $tryno, "of", $tries);
+      my $result;
+      eval {
+         $result = $try->(tryno=>$tryno);
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d("Try code failed:", $EVAL_ERROR);
+         $last_error = $EVAL_ERROR;
+
+         if ( $tryno < $tries ) {   # more retries
+            my $retry = $fail->(tryno=>$tryno, error=>$last_error);
+            last TRY unless $retry;
+            PTDEBUG && _d("Calling wait code");
+            $wait->(tryno=>$tryno);
+         }
+      }
+      else {
+         PTDEBUG && _d("Try code succeeded");
+         return $result;
+      }
+   }
+
+   PTDEBUG && _d('Try code did not succeed');
+   return $final_fail->(error=>$last_error);
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Retry package
+# ###########################################################################
+
+# ###########################################################################
 # Transformers package
 # This package is a copy without comments from the original.  The original
 # with comments and its test file can be found in the Bazaar repository at,
@@ -4734,7 +4813,7 @@
       $dbh->do($sql);
 
       $sql = ($o->get('replace') ? "REPLACE" : "INSERT")
-           . qq/ INTO $db_tbl (ts, server_id) VALUES (NOW(), $server_id)/;
+           . qq/ INTO $db_tbl (ts, server_id) VALUES (UTC_TIMESTAMP(), $server_id)/;
       PTDEBUG && _d($sql);
       # This may fail if the table already existed and already had this row.
       # We eval to ignore this possibility.
@@ -4831,7 +4910,7 @@
          PTDEBUG && _d('No heartbeat row in table');
          if ( $o->get('insert-heartbeat-row') ) {
             my $sql = "INSERT INTO $db_tbl ($pk_col, ts) "
-                    . "VALUES ('$pk_val', NOW())";
+                    . "VALUES ('$pk_val', UTC_TIMESTAMP())";
             PTDEBUG && _d($sql);
             $dbh->do($sql);
          }
@@ -4920,18 +4999,44 @@
             }
          }
 
-         $sth->execute(ts(time), @vals);
-         PTDEBUG && _d($sth->{Statement});
-         $sth->finish();
-
+         my $retry = Retry->new();
+         $retry->retry(
+            tries => 3,
+            wait  => sub { sleep 0.25; return; },
+            try   => sub {
+               my ($now) = $dbh->selectrow_array(q{SELECT UTC_TIMESTAMP()});
+               $sth->execute($now, @vals);
+               PTDEBUG && _d($sth->{Statement});
+               $sth->finish();
+            },
+            fail => sub {
+               my (%args) = @_;
+               my $error = $args{error};
+               if ( $error =~ m/Deadlock found/ ) {
+                  return 1;  # try again
+               }
+               else {
+                  return 0;
+               }
+            },
+            final_fail => sub {
+               my (%args) = @_;
+               die $args{error};
+            }
+         );
+         
          return;
       };
    }
    else { # --monitor or --check
       my $dbi_driver = lc $o->get('dbi-driver');
 
+      # UNIX_TIMESTAMP(UTC_TIMESTAMP()) instead of UNIX_TIMESTAMP() alone,
+      # so we make sure that we aren't being fooled by a timezone.
+      # UNIX_TIMESTAMP(ts) replaces unix_timestamp($ts) -- MySQL is the
+      # authority here, so let it calculate everything.
       $heartbeat_sql
-         = "SELECT ts"
+         = "SELECT UNIX_TIMESTAMP(UTC_TIMESTAMP()), UNIX_TIMESTAMP(ts)"
          . ($dbi_driver eq 'mysql' ? '/*!50038, @@hostname AS host*/' : '')
          . ($id ? "" : ", server_id")
          . " FROM $db_tbl "
@@ -4945,13 +5050,12 @@
          my ($sth) = @_;
          $sth->execute();
          PTDEBUG && _d($sth->{Statement});
-         my ($ts, $hostname, $server_id) = $sth->fetchrow_array();
-         my $now = time;
+         my ($now, $ts, $hostname, $server_id) = $sth->fetchrow_array();
          PTDEBUG && _d("Heartbeat from server", $server_id, "\n",
-            " now:", ts($now), "\n",
+            " now:", $now, "\n",
             "  ts:", $ts, "\n",
             "skew:", $skew);
-         my $delay = $now - unix_timestamp($ts) - $skew;
+         my $delay = $now - $ts - $skew;
          PTDEBUG && _d('Delay', sprintf('%.6f', $delay), 'on', $hostname);
 
          # Because we adjust for skew, if the ts are less than skew seconds
@@ -5387,6 +5491,19 @@
 columns are optional.  If any are present, their corresponding information
 will be saved.
 
+=head1 Percona XtraDB Cluster
+
+Although pt-heartbeat should work with all supported versions of Percona XtraDB
+Cluster (PXC), we recommend using 5.5.28-23.7 and newer.
+
+If you are setting up heartbeat instances between cluster nodes, keep in mind
+that, since the speed of the cluster is determined by its slowest node,
+pt-heartbeat will not report how fast the cluster itself is, but only how
+fast events are replicating from one node to another.  
+
+You must specify L<"--master-server-id"> for L<"--monitor"> and L<"--check">
+instances.
+
 =head1 OPTIONS
 
 Specify at least one of L<"--stop">, L<"--update">, L<"--monitor">, or L<"--check">.
@@ -5446,7 +5563,7 @@
 The heartbeat table requires at least one row.  If you manually create the
 heartbeat table, then you must insert a row by doing:
 
-  INSERT INTO heartbeat (ts, server_id) VALUES (NOW(), N);
+  INSERT INTO heartbeat (ts, server_id) VALUES (UTC_TIMESTAMP(), N);
 
 where C<N> is the server's ID; do not use @@server_id because it will replicate
 and slaves will insert their own server ID instead of the master's server ID.
@@ -5464,7 +5581,7 @@
 of a multi-slave hierarchy like "master -> slave1 -> slave2".
 To manually insert the one required row into a legacy table:
 
-  INSERT INTO heartbeat (id, ts) VALUES (1, NOW());
+  INSERT INTO heartbeat (id, ts) VALUES (1, UTC_TIMESTAMP());
 
 The tool automatically detects if the heartbeat table is legacy.
 

=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2012-12-03 03:48:11 +0000
+++ bin/pt-index-usage	2012-12-20 23:20:32 +0000
@@ -3844,11 +3844,16 @@
 
    if ( !$self->{initialized} ) {
       $self->{initialized} = 1;
-      if ( $self->{resume}->{tbl}
-           && !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
-         PTDEBUG && _d('Will resume after',
-            join('.', @{$self->{resume}}{qw(db tbl)}));
-         $self->{resume}->{after} = 1;
+      if ( $self->{resume}->{tbl} ) {
+         if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
+            PTDEBUG && _d('Will resume after',
+               join('.', @{$self->{resume}}{qw(db tbl)}));
+            $self->{resume}->{after}->{tbl} = 1;
+         }
+         if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
+            PTDEBUG && _d('Will resume after', $self->{resume}->{db});
+            $self->{resume}->{after}->{db}  = 1;
+         }
       }
    }
 
@@ -3946,16 +3951,17 @@
    if ( !defined $self->{dbs} ) {
       my $sql = 'SHOW DATABASES';
       PTDEBUG && _d($sql);
-      my @dbs = grep { $self->database_is_allowed($_) }
-                @{$dbh->selectcol_arrayref($sql)};
+      my @dbs = grep {
+                  $self->_resume_from_database($_)
+                  &&
+                  $self->database_is_allowed($_)
+                } @{$dbh->selectcol_arrayref($sql)};
       PTDEBUG && _d('Found', scalar @dbs, 'databases');
       $self->{dbs} = \@dbs;
    }
 
    if ( !$self->{db} ) {
-      do {
-         $self->{db} = shift @{$self->{dbs}};
-      } until $self->_resume_from_database($self->{db});
+      $self->{db} = shift @{$self->{dbs}};
       PTDEBUG && _d('Next database:', $self->{db});
       return unless $self->{db};
    }
@@ -4057,9 +4063,15 @@
 
    my $filter = $self->{filters};
 
-   if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
-      return 0;
-   }
+   return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
+       general_log
+      |slow_log
+      |innodb_index_stats
+      |innodb_table_stats
+      |slave_master_info
+      |slave_relay_log_info
+      |slave_worker_info
+   )$/x;
 
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'
@@ -4128,11 +4140,17 @@
    my ($self, $db) = @_;
 
    return 1 unless $self->{resume}->{db};
-
    if ( $db eq $self->{resume}->{db} ) {
-      PTDEBUG && _d('At resume db', $db);
-      delete $self->{resume}->{db};
-      return 1;
+      if ( !$self->{resume}->{after}->{db} ) {
+         PTDEBUG && _d('Resuming from db', $db);
+         delete $self->{resume}->{db};
+         return 1;
+      }
+      else {
+         PTDEBUG && _d('Resuming after db', $db);
+         delete $self->{resume}->{db};
+         delete $self->{resume}->{tbl};
+      }
    }
 
    return 0;
@@ -4144,7 +4162,7 @@
    return 1 unless $self->{resume}->{tbl};
 
    if ( $tbl eq $self->{resume}->{tbl} ) {
-      if ( !$self->{resume}->{after} ) {
+      if ( !$self->{resume}->{after}->{tbl} ) {
          PTDEBUG && _d('Resuming from table', $tbl);
          delete $self->{resume}->{tbl};
          return 1;

=== modified file 'bin/pt-log-player'
--- bin/pt-log-player	2012-12-03 03:48:11 +0000
+++ bin/pt-log-player	2012-12-20 23:20:32 +0000
@@ -3100,6 +3100,11 @@
 At the time of this release there is a bug which causes pt-log-player to
 exceed max open files during L<"--split">.
 
+As of version 2.1.8, this tool no longer works with auto values on zero
+because it sets a SQL mode with C<NO_AUTO_VALUE_ON_ZERO>.  Therefore,
+playing INSERT or UPDATE statements that use zero instead of C<NULL>
+will not work.
+
 The authoritative source for updated information is always the online issue
 tracking system.  Issues that affect this tool will be marked as such.  You can
 see a list of such issues at the following URL:

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2012-12-06 00:10:22 +0000
+++ bin/pt-mysql-summary	2012-12-20 23:20:32 +0000
@@ -2332,8 +2332,10 @@
 
 TOOL="pt-mysql-summary"
 
-CMD_MYSQL="$(_which mysql)"
-CMD_MYSQLDUMP="$( _which mysqldump )"
+# These vars are declared earlier in the collect_mysql_info package,
+# but if they're still undefined here, try to find them in PATH.
+[ "$CMD_MYSQL" ]     || CMD_MYSQL="$(_which mysql)"
+[ "$CMD_MYSQLDUMP" ] || CMD_MYSQLDUMP="$( _which mysqldump )"
 
 check_mysql () {
    # Check that mysql and mysqldump are in PATH.  If not, we're

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2012-12-11 14:48:44 +0000
+++ bin/pt-table-checksum	2012-12-20 23:20:32 +0000
@@ -6986,9 +6986,15 @@
 
    my $filter = $self->{filters};
 
-   if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
-      return 0;
-   }
+   return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
+       general_log
+      |slow_log
+      |innodb_index_stats
+      |innodb_table_stats
+      |slave_master_info
+      |slave_relay_log_info
+      |slave_worker_info
+   )$/x;
 
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'
@@ -10123,9 +10129,9 @@
             }
          }
          else {
+            warn $EVAL_ERROR;
             die "--replicate database $db does not exist and it cannot be "
-               . "created automatically.  You need to create the database. "
-               . $EVAL_ERROR;
+               . "created automatically.  You need to create the database.\n";
          }
       }
    }
@@ -10193,9 +10199,9 @@
             }
          }
          else {
+            warn $EVAL_ERROR;
             die "--replicate table $tbl does not exist and it cannot be "
-               . "created automatically.  You need to create the table. "
-               . $EVAL_ERROR;
+               . "created automatically.  You need to create the table.\n"
          }
       }
    }

=== modified file 'bin/pt-table-sync'
--- bin/pt-table-sync	2012-12-03 03:48:11 +0000
+++ bin/pt-table-sync	2012-12-20 23:20:32 +0000
@@ -7521,11 +7521,16 @@
 
    if ( !$self->{initialized} ) {
       $self->{initialized} = 1;
-      if ( $self->{resume}->{tbl}
-           && !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
-         PTDEBUG && _d('Will resume after',
-            join('.', @{$self->{resume}}{qw(db tbl)}));
-         $self->{resume}->{after} = 1;
+      if ( $self->{resume}->{tbl} ) {
+         if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
+            PTDEBUG && _d('Will resume after',
+               join('.', @{$self->{resume}}{qw(db tbl)}));
+            $self->{resume}->{after}->{tbl} = 1;
+         }
+         if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
+            PTDEBUG && _d('Will resume after', $self->{resume}->{db});
+            $self->{resume}->{after}->{db}  = 1;
+         }
       }
    }
 
@@ -7623,16 +7628,17 @@
    if ( !defined $self->{dbs} ) {
       my $sql = 'SHOW DATABASES';
       PTDEBUG && _d($sql);
-      my @dbs = grep { $self->database_is_allowed($_) }
-                @{$dbh->selectcol_arrayref($sql)};
+      my @dbs = grep {
+                  $self->_resume_from_database($_)
+                  &&
+                  $self->database_is_allowed($_)
+                } @{$dbh->selectcol_arrayref($sql)};
       PTDEBUG && _d('Found', scalar @dbs, 'databases');
       $self->{dbs} = \@dbs;
    }
 
    if ( !$self->{db} ) {
-      do {
-         $self->{db} = shift @{$self->{dbs}};
-      } until $self->_resume_from_database($self->{db});
+      $self->{db} = shift @{$self->{dbs}};
       PTDEBUG && _d('Next database:', $self->{db});
       return unless $self->{db};
    }
@@ -7734,9 +7740,15 @@
 
    my $filter = $self->{filters};
 
-   if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
-      return 0;
-   }
+   return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
+       general_log
+      |slow_log
+      |innodb_index_stats
+      |innodb_table_stats
+      |slave_master_info
+      |slave_relay_log_info
+      |slave_worker_info
+   )$/x;
 
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'
@@ -7805,11 +7817,17 @@
    my ($self, $db) = @_;
 
    return 1 unless $self->{resume}->{db};
-
    if ( $db eq $self->{resume}->{db} ) {
-      PTDEBUG && _d('At resume db', $db);
-      delete $self->{resume}->{db};
-      return 1;
+      if ( !$self->{resume}->{after}->{db} ) {
+         PTDEBUG && _d('Resuming from db', $db);
+         delete $self->{resume}->{db};
+         return 1;
+      }
+      else {
+         PTDEBUG && _d('Resuming after db', $db);
+         delete $self->{resume}->{db};
+         delete $self->{resume}->{tbl};
+      }
    }
 
    return 0;
@@ -7821,7 +7839,7 @@
    return 1 unless $self->{resume}->{tbl};
 
    if ( $tbl eq $self->{resume}->{tbl} ) {
-      if ( !$self->{resume}->{after} ) {
+      if ( !$self->{resume}->{after}->{tbl} ) {
          PTDEBUG && _d('Resuming from table', $tbl);
          delete $self->{resume}->{tbl};
          return 1;

=== modified file 'bin/pt-table-usage'
--- bin/pt-table-usage	2012-11-19 18:47:13 +0000
+++ bin/pt-table-usage	2012-12-20 23:20:32 +0000
@@ -212,7 +212,8 @@
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
                      qw(F h P S A))
-         . ';mysql_read_default_group=client';
+         . ';mysql_read_default_group=client'
+         . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
    PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
@@ -241,6 +242,9 @@
       mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
    };
    @{$defaults}{ keys %$opts } = values %$opts;
+   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
+      $defaults->{mysql_local_infile} = 1;
+   }
 
    if ( $opts->{mysql_use_result} ) {
       $defaults->{mysql_use_result} = 1;

=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade	2012-12-03 03:48:11 +0000
+++ bin/pt-upgrade	2012-12-20 23:20:32 +0000
@@ -11980,7 +11980,8 @@
    # ########################################################################
    # Do the version-check
    # ########################################################################
-   if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
+   if ( $o->get('version-check') ne 'off'
+        && (!$o->has('quiet') || !$o->get('quiet')) ) {
       Pingback::version_check(
          instances => [ map({ +{ dbh => $_->{dbh}, dsn => $_->{dsn} } } @$hosts) ],
          protocol  => $o->get('version-check'),
@@ -11988,6 +11989,15 @@
    }
 
    # ########################################################################
+   # Disable the query cache.
+   # ########################################################################
+   if ( $o->get('disable-query-cache') ) {
+      foreach my $host ( @$hosts ) {
+         disable_query_cache($host);
+      }
+   }
+
+   # ########################################################################
    # Short version: do it!  Long version: this callback does the main work.
    # The big picture is:
    #   [event] -> exec on hosts -> compare -> aggregate -> [meta-event]
@@ -12385,6 +12395,31 @@
    return $dbh;
 }
 
+sub disable_query_cache {
+   my ($host) = @_;
+   die "I need a host argument" unless $host;
+   my ($dbh, $host_name) = @{$host}{qw(dbh name)};
+
+   my $sql = 'SELECT @@query_cache_type';
+   PTDEBUG && _d($host_name, $sql);
+   my ($query_cache_type) = $dbh->selectrow_array($sql);
+   PTDEBUG && _d($host_name, $query_cache_type);
+   return if ($query_cache_type || '') =~ m/OFF|0/;
+
+   $sql = q/SET SESSION query_cache_type = OFF/;
+   eval {
+      PTDEBUG && _d($host_name, $sql);
+      $dbh->do($sql);
+   };
+   if ( $EVAL_ERROR ) {
+      warn $EVAL_ERROR;
+      die "Failed to $sql on $host_name.  Disable the query cache "
+         . "manually, or specify --no-disable-query-cache.\n";
+   }
+
+   return;
+}
+
 # Catches signals so we can exit gracefully.
 sub sig_int {
    my ( $signal ) = @_;
@@ -12693,6 +12728,12 @@
 Fork to the background and detach from the shell.  POSIX
 operating systems only.
 
+=item --[no]disable-query-cache
+
+default: yes
+
+C<SET SESSION query_cache_type = OFF> to disable the query cache.
+
 =item --explain-hosts
 
 Print connection information and exit.
@@ -12861,7 +12902,7 @@
 
 =item --set-vars
 
-type: string; default: wait_timeout=10000,query_cache_type=0
+type: string; default: wait_timeout=10000
 
 Set these MySQL variables.  Immediately after connecting to MySQL, this
 string will be appended to SET and executed.

=== modified file 'bin/pt-visual-explain'
--- bin/pt-visual-explain	2012-11-19 18:47:13 +0000
+++ bin/pt-visual-explain	2012-12-20 23:20:32 +0000
@@ -1900,7 +1900,8 @@
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
                      qw(F h P S A))
-         . ';mysql_read_default_group=client';
+         . ';mysql_read_default_group=client'
+         . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
    PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
@@ -1929,6 +1930,9 @@
       mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
    };
    @{$defaults}{ keys %$opts } = values %$opts;
+   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
+      $defaults->{mysql_local_infile} = 1;
+   }
 
    if ( $opts->{mysql_use_result} ) {
       $defaults->{mysql_use_result} = 1;

=== modified file 'lib/Sandbox.pm'
--- lib/Sandbox.pm	2012-11-30 18:13:04 +0000
+++ lib/Sandbox.pm	2012-12-20 23:20:32 +0000
@@ -126,12 +126,13 @@
 }
    
 sub get_dbh_for {
-   my ( $self, $server, $cxn_ops ) = @_;
+   my ( $self, $server, $cxn_ops, $user ) = @_;
    _check_server($server);
    $cxn_ops ||= { AutoCommit => 1 };
+   $user    ||= 'msandbox';
    PTDEBUG && _d('dbh for', $server, 'on port', $port_for{$server});
    my $dp = $self->{DSNParser};
-   my $dsn = $dp->parse('h=127.0.0.1,u=msandbox,p=msandbox,P=' . $port_for{$server});
+   my $dsn = $dp->parse("h=127.0.0.1,u=$user,p=msandbox,P=" . $port_for{$server});
    my $dbh;
    # This is primarily for the benefit of CompareResults, but it's
    # also quite convenient when using an affected OS
@@ -335,11 +336,11 @@
    my $master_dbh = $self->get_dbh_for($args{master} || 'master');
    my $slave2_dbh = $self->get_dbh_for($args{slave}  || 'slave2');
    my ($ping) = $master_dbh->selectrow_array("SELECT MD5(RAND())");
-   $master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1");
+   $master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
    PerconaTest::wait_until(
       sub {
          my ($pong) = $slave2_dbh->selectrow_array(
-            "SELECT ping FROM percona_test.sentinel WHERE id=1");
+            "SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_slaves */");
          return $ping eq $pong;
       }, undef, 300
    );
@@ -542,6 +543,23 @@
    return "/tmp/$port/my.sandbox.cnf"
 }
 
+sub do_as_root {
+   my ($self, $server, @queries) = @_;
+   my $dbh = $self->get_dbh_for($server, undef, 'root');
+   my $ok = 1;
+   eval {
+      foreach my $query ( @queries ) {
+         $dbh->do($query);
+      }
+   };
+   if ( $EVAL_ERROR ) {
+      $ok = 0;
+      warn $EVAL_ERROR;
+   }
+   $dbh->disconnect;
+   return $ok;
+}
+
 sub _d {
    my ($package, undef, $line) = caller 0;
    @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }

=== modified file 'lib/SchemaIterator.pm'
--- lib/SchemaIterator.pm	2012-12-05 23:30:29 +0000
+++ lib/SchemaIterator.pm	2012-12-20 23:20:32 +0000
@@ -444,9 +444,15 @@
    my $filter = $self->{filters};
 
    # Always auto-skip these pseudo tables.
-   if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
-      return 0;
-   }
+   return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
+       general_log
+      |slow_log
+      |innodb_index_stats
+      |innodb_table_stats
+      |slave_master_info
+      |slave_relay_log_info
+      |slave_worker_info
+   )$/x;
 
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'

=== modified file 'lib/Transformers.pm'
--- lib/Transformers.pm	2012-02-07 14:07:41 +0000
+++ lib/Transformers.pm	2012-12-20 23:20:32 +0000
@@ -193,6 +193,10 @@
                      . (defined $f ? '%09.6f' : '%02d'),
                      $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
    }
+   # MySQL 5.6+ uses "proper" timestamps
+   elsif ( $val =~ m/^$proper_ts$/ ) {
+      return $val;
+   }
    return $val;
 }
 

=== modified file 'sandbox/jenkins-test'
--- sandbox/jenkins-test	2012-12-07 21:55:52 +0000
+++ sandbox/jenkins-test	2012-12-20 23:20:32 +0000
@@ -46,6 +46,13 @@
 }
 
 MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
+
+REFETCH_MYSQL="${REFETCH_MYSQL:-""}"
+if [ "$MYSQL_BASE_DIR" -a "$REFETCH_MYSQL" ]; then
+   rm -rf "$MYSQL_BASE_DIR"
+   MYSQL_BASE_DIR=""
+fi
+
 if [ -z "$MYSQL_BASE_DIR" ]; then
    (
       cd $MYSQL_BIN_DIR
@@ -66,8 +73,9 @@
 ##########################
 export PERCONA_TOOLKIT_BRANCH="$PWD"
 export PERCONA_TOOLKIT_SANDBOX="$MYSQL_BASE_DIR"
-export PATH="$PATH:/usr/sbin:$MYSQL_BASE_DIR/bin"
+export PATH="$PATH:/usr/sbin:/usr/local/bin:$MYSQL_BASE_DIR/bin"
 export LANG="en_US.UTF-8"
+export USER="${USER:-"jenkins"}"
 
 # ######################################### #
 # Remove conf files that's shouldn't exist. #

=== modified file 'sandbox/servers/5.6/data.tar.gz'
Binary files sandbox/servers/5.6/data.tar.gz	2012-10-16 15:13:19 +0000 and sandbox/servers/5.6/data.tar.gz	2012-12-20 23:20:32 +0000 differ
=== modified file 'sandbox/start-sandbox'
--- sandbox/start-sandbox	2012-11-16 19:08:49 +0000
+++ sandbox/start-sandbox	2012-12-20 23:20:32 +0000
@@ -34,7 +34,7 @@
    cp $PERCONA_TOOLKIT_BRANCH/sandbox/servers/$version/my.sandbox.cnf /tmp/$port
    tar xzf $PERCONA_TOOLKIT_BRANCH/sandbox/servers/$version/data.tar.gz -C /tmp/$port
 
-   for script in `ls $PERCONA_TOOLKIT_BRANCH/sandbox/servers/*`; do
+   for script in "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/"*; do
       if [ -f $script ]; then
         cp $script /tmp/$port
       fi
@@ -52,6 +52,10 @@
       if [ -n "${master_port}" ]; then
          local master_listen_port=$(($master_port + 10))
          cluster_address="gcomm://$ip:$master_listen_port"
+
+         local this_listen_port=$(($port + 10))
+         local this_cluster_address="gcomm://$ip:$this_listen_port"
+         sed -e "s!gcomm://\$!$this_cluster_address!g" -i.bak "/tmp/$master_port/my.sandbox.cnf"
       fi
 
       sed -e "s/ADDR/$ip/g" -i.bak "/tmp/$port/my.sandbox.cnf"
@@ -85,6 +89,9 @@
    if [ -n "$SKIP_INNODB" ]; then
       echo "skip-innodb" >> /tmp/$port/my.sandbox.cnf
       echo "default-storage-engine=myisam" >> /tmp/$port/my.sandbox.cnf
+      if [ "$version" ">" "5.5" ]; then
+         echo "default-tmp-storage-engine=myisam" >> /tmp/$port/my.sandbox.cnf
+      fi
    fi
    if [ -n "$MODE_ANSI" ]; then
       echo "sql_mode=ansi" >> /tmp/$port/my.sandbox.cnf
@@ -95,6 +102,10 @@
    if [ -n "$LOCAL_INFILE" ]; then
       echo "local-infile=$LOCAL_INFILE" >> /tmp/$port/my.sandbox.cnf
    fi
+   if [ -n "$QUERY_CACHE_SIZE" ]; then
+      echo "query_cache_type=1" >> /tmp/$port/my.sandbox.cnf
+      echo "query_cache_size=$QUERY_CACHE_SIZE" >> /tmp/$port/my.sandbox.cnf
+   fi
 
    # If the sandbox is a slave, set it read_only.
    if [ "$type" = "slave" ]; then
@@ -112,6 +123,10 @@
             debug_sandbox $port
             exit 1
          fi
+
+         for sql in "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/$version/"*.sql; do
+            [ -f "$sql" ] && /tmp/$port/use < $sql
+         done
       fi
    else
       echo "Sandbox $type $port failed to start." >&2
@@ -119,6 +134,10 @@
       exit 1
    fi
 
+   /tmp/$port/use -e "CREATE DATABASE IF NOT EXISTS percona_test";
+   /tmp/$port/use -e "CREATE TABLE IF NOT EXISTS percona_test.sentinel (id INT PRIMARY KEY, ping VARCHAR(64) NOT NULL DEFAULT '')";
+   /tmp/$port/use -e "REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')";
+
    # If the sandbox is a slave, start the slave.
    if [ "$type" = "slave" ]; then
       /tmp/$port/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=$master_port"

=== modified file 'sandbox/test-env'
--- sandbox/test-env	2012-12-03 20:06:47 +0000
+++ sandbox/test-env	2012-12-20 23:20:32 +0000
@@ -299,6 +299,12 @@
          exit_status=$((exit_status | $?))
 
          if [ "${2:-""}" = "cluster" ]; then
+            # Bit of magic here. 'start-sandbox cluster new_node old_node'
+            # changes old_node's my.sandbox.cnf's wsrep_cluster_address to
+            # point to new_node. This is especially useful because otherwise,
+            # calling stop/start like below on 12345 would create a new cluster.
+            /tmp/12345/stop  >/dev/null
+            /tmp/12345/start >/dev/null
             echo -n "Checking that the cluster size is correct... "
             size=$(/tmp/12345/use -ss -e "SHOW STATUS LIKE 'wsrep_cluster_size'" | awk '{print $2}')
             if [ ${size:-0} -ne 3 ]; then
@@ -328,11 +334,10 @@
             ../util/check-load-data
 
             ping=$(/tmp/12345/use -ss -e "SELECT MD5(RAND())")
-            /tmp/12345/use -e "create table percona_test.sentinel(id int primary key, ping varchar(64) not null default '')"
-            /tmp/12345/use -e "insert into percona_test.sentinel(id, ping) values(1, '$ping')";
+            /tmp/12345/use -e "UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1";
             echo -n "Waiting for replication to finish..."
             for i in $(_seq 60); do
-               pong=$(/tmp/12347/use -ss -e 'select ping from percona_test.sentinel where id=1' 2>/dev/null)
+               pong=$(/tmp/12347/use -ss -e 'SELECT ping FROM percona_test.sentinel WHERE id=1' 2>/dev/null)
                [ "$ping" = "$pong" ] && break
                echo -n '.'
                sleep 1

=== modified file 't/lib/ExplainAnalyzer.t'
--- t/lib/ExplainAnalyzer.t	2012-06-03 17:54:32 +0000
+++ t/lib/ExplainAnalyzer.t	2012-12-20 23:20:32 +0000
@@ -31,9 +31,6 @@
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
-else {
-   plan tests => 17;
-}
 
 $dbh->do('use sakila');
 
@@ -60,7 +57,7 @@
         key_len       => 2,
         ref           => 'const',
         rows          => 1,
-        Extra         => '',
+        Extra         => $sandbox_version eq '5.6' ? undef : '',
       },
    ],
    'Got a simple EXPLAIN result',
@@ -81,7 +78,7 @@
         key_len       => 2,
         ref           => 'const',
         rows          => 1,
-        Extra         => '',
+        Extra         => $sandbox_version eq '5.6' ? undef : '',
       },
    ],
    'Got EXPLAIN result for a DELETE',
@@ -575,4 +572,4 @@
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== modified file 't/lib/NibbleIterator.t'
--- t/lib/NibbleIterator.t	2012-11-28 22:00:30 +0000
+++ t/lib/NibbleIterator.t	2012-12-20 23:20:32 +0000
@@ -713,8 +713,8 @@
 # ############################################################################
 $ni = make_nibble_iter(
    db         => 'mysql',
-   tbl        => 'host',
-   argv       => [qw(--tables mysql.host --chunk-size-limit 0)],
+   tbl        => 'columns_priv',
+   argv       => [qw(--tables mysql.columns_priv --chunk-size-limit 0)],
 );
 
 @rows = ();

=== modified file 't/lib/QueryReportFormatter.t'
--- t/lib/QueryReportFormatter.t	2012-11-15 18:17:03 +0000
+++ t/lib/QueryReportFormatter.t	2012-12-20 23:20:32 +0000
@@ -1141,9 +1141,9 @@
    );
 
    my $explain = load_file(
-      $sandbox_version ge '5.1'
-         ? "t/lib/samples/QueryReportFormatter/report025.txt"
-         : "t/lib/samples/QueryReportFormatter/report026.txt");
+        $sandbox_version eq '5.6' ? "t/lib/samples/QueryReportFormatter/report031.txt"
+      : $sandbox_version ge '5.1' ? "t/lib/samples/QueryReportFormatter/report025.txt"
+      :                             "t/lib/samples/QueryReportFormatter/report026.txt");
 
    is(
       $qrf->explain_report("select * from qrf.t where i=2", 'qrf'),
@@ -1180,11 +1180,13 @@
    # so if it doesn't USE db then the EXPLAIN will fail.  Here we reset
    # the db to something else because we already called explain_report()
    # above which did USE qrf.
+   #
+   # 5.6 really is that different: ia vs. TF>aI.  It's smarter.
    $dbh->do("USE mysql");
    my $explain_sparkline = $qrf->explain_sparkline($arg, 'qrf');
    is(
       $explain_sparkline,
-      "TF>aI",
+      $sandbox_version eq '5.6' ? "ia" : "TF>aI",
       "explain_sparkling() uses db"
    );
 
@@ -1206,9 +1208,9 @@
                groupby => 'fingerprint',
             );
          },
-         ($sandbox_version ge '5.1' ?
-              "t/lib/samples/QueryReportFormatter/report027.txt"
-            : "t/lib/samples/QueryReportFormatter/report029.txt"),
+         (  $sandbox_version eq '5.6' ?  "t/lib/samples/QueryReportFormatter/report032.txt"
+          : $sandbox_version ge '5.1' ? "t/lib/samples/QueryReportFormatter/report027.txt"
+          :                             "t/lib/samples/QueryReportFormatter/report029.txt"),
       ),
       "EXPLAIN sparkline (issue 1141)"
    );

=== modified file 't/lib/SchemaIterator.t'
--- t/lib/SchemaIterator.t	2012-12-05 23:30:29 +0000
+++ t/lib/SchemaIterator.t	2012-12-20 23:20:32 +0000
@@ -149,9 +149,7 @@
    # Test simple, unfiltered get_db_itr().
    # ########################################################################
    test_so(
-      result    => $sandbox_version ge '5.5' ? "$out/all-dbs-tbls.txt"
-                 : $sandbox_version ge '5.1' ? "$out/all-dbs-tbls-5.1.txt"
-                 :                             "$out/all-dbs-tbls-5.0.txt",
+      result    => "$out/all-dbs-tbls-$sandbox_version.txt",
       test_name => "Iterate all schema objects with dbh",
    );
 
@@ -331,9 +329,7 @@
    # ########################################################################
    test_so(
       filters   => [qw(-t mysql.user)],
-      result    => $sandbox_version ge '5.5' ? "$out/mysql-user-ddl-5.5.txt"
-                 : $sandbox_version ge '5.1' ? "$out/mysql-user-ddl.txt"
-                                             : "$out/mysql-user-ddl-5.0.txt",
+      result    => "$out/mysql-user-ddl-$sandbox_version.txt",
       test_name => "Get CREATE TABLE with dbh",
    );
 

=== modified file 't/lib/bash/collect_system_info.sh'
--- t/lib/bash/collect_system_info.sh	2012-08-24 22:39:58 +0000
+++ t/lib/bash/collect_system_info.sh	2012-12-20 23:20:32 +0000
@@ -267,7 +267,7 @@
 ) 2>/dev/null &
 forked_pid="$!"
 
-if [ -e /proc/$forked_pid/oom_adj ] \
+if [ -w /proc/$forked_pid/oom_adj ] \
       && echo "-17" > /proc/$forked_pid/oom_adj 2>/dev/null; then
 
    notable_processes_info > "$PT_TMPDIR/notable_procs"
@@ -277,7 +277,7 @@
       "notable_proccesses_info finds the process we manually changed earlier"
 
 else
-   skip 1 1 "Either this OS doesn't have an oom, or this user doesn't have enough privileges to change the oom of other processes"
+   skip 1 1 "oom_adj doesn't exist or isn't writeable"
 fi
 
 disown $forked_pid

=== added file 't/lib/samples/QueryReportFormatter/report031.txt'
--- t/lib/samples/QueryReportFormatter/report031.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/QueryReportFormatter/report031.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,12 @@
+# *************************** 1. row ***************************
+#            id: 1
+#   select_type: SIMPLE
+#         table: t
+#    partitions: NULL
+#          type: const
+# possible_keys: PRIMARY
+#           key: PRIMARY
+#       key_len: 4
+#           ref: const
+#          rows: 1
+#         Extra: NULL

=== added file 't/lib/samples/QueryReportFormatter/report032.txt'
--- t/lib/samples/QueryReportFormatter/report032.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/QueryReportFormatter/report032.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,58 @@
+
+# Profile
+# Rank Query ID           Response time Calls R/Call Apdx V/M   EXPLAIN Item
+# ==== ================== ============= ===== ====== ==== ===== ======= =========
+#    1 0x46F81B022F1AD76B 0.0003 100.0%     1 0.0003   NS  0.00 ia      SELECT t
+# MISC 0xMISC             0.0003 100.0%     1 0.0003   NS   0.0 MISC    <1 ITEMS>
+
+# Query 1: 0 QPS, 0x concurrency, ID 0x46F81B022F1AD76B at byte 0 ________
+# Scores: Apdex = NS [0.0]*, V/M = 0.00
+# EXPLAIN sparkline: ia
+# Query_time sparkline: |  ^     |
+# Time range: all events occurred at 2009-12-08 09:23:49.637394
+# Attribute    pct   total     min     max     avg     95%  stddev  median
+# ============ === ======= ======= ======= ======= ======= ======= =======
+# Count        100       1
+# Exec time    100   286us   286us   286us   286us   286us       0   286us
+# Query size   100      90      90      90      90      90       0      90
+# String:
+# cmd          Query
+# Databases    qrf
+# Query_time distribution
+#   1us
+#  10us
+# 100us  ################################################################
+#   1ms
+#  10ms
+# 100ms
+#    1s
+#  10s+
+# Tables
+#    SHOW TABLE STATUS FROM `qrf` LIKE 't'\G
+#    SHOW CREATE TABLE `qrf`.`t`\G
+# EXPLAIN /*!50100 PARTITIONS*/
+select t1.i from t as t1 join t as t2 where t1.i < t2.i and t1.v is not null order by t1.i\G
+# *************************** 1. row ***************************
+#            id: 1
+#   select_type: SIMPLE
+#         table: t1
+#    partitions: NULL
+#          type: index
+# possible_keys: PRIMARY
+#           key: PRIMARY
+#       key_len: 4
+#           ref: NULL
+#          rows: 4
+#         Extra: Using where
+# *************************** 2. row ***************************
+#            id: 1
+#   select_type: SIMPLE
+#         table: t2
+#    partitions: NULL
+#          type: ALL
+# possible_keys: PRIMARY
+#           key: NULL
+#       key_len: NULL
+#           ref: NULL
+#          rows: 4
+#         Extra: Range checked for each record (index map: 0x1)

=== renamed file 't/lib/samples/SchemaIterator/all-dbs-tbls.txt' => 't/lib/samples/SchemaIterator/all-dbs-tbls-5.5.txt'
=== added file 't/lib/samples/SchemaIterator/all-dbs-tbls-5.6.txt'
--- t/lib/samples/SchemaIterator/all-dbs-tbls-5.6.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/SchemaIterator/all-dbs-tbls-5.6.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,537 @@
+mysql.columns_priv
+CREATE TABLE `columns_priv` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges'
+
+mysql.db
+CREATE TABLE `db` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Host`,`Db`,`User`),
+  KEY `User` (`User`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
+
+mysql.event
+CREATE TABLE `event` (
+  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) NOT NULL DEFAULT '',
+  `body` longblob NOT NULL,
+  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `execute_at` datetime DEFAULT NULL,
+  `interval_value` int(11) DEFAULT NULL,
+  `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `last_executed` datetime DEFAULT NULL,
+  `starts` datetime DEFAULT NULL,
+  `ends` datetime DEFAULT NULL,
+  `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED',
+  `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
+  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `originator` int(10) unsigned NOT NULL,
+  `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM',
+  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `body_utf8` longblob,
+  PRIMARY KEY (`db`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
+
+mysql.func
+CREATE TABLE `func` (
+  `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `ret` tinyint(1) NOT NULL DEFAULT '0',
+  `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL,
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions'
+
+mysql.help_category
+CREATE TABLE `help_category` (
+  `help_category_id` smallint(5) unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  `parent_category_id` smallint(5) unsigned DEFAULT NULL,
+  `url` char(128) NOT NULL,
+  PRIMARY KEY (`help_category_id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='help categories'
+
+mysql.help_keyword
+CREATE TABLE `help_keyword` (
+  `help_keyword_id` int(10) unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  PRIMARY KEY (`help_keyword_id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='help keywords'
+
+mysql.help_relation
+CREATE TABLE `help_relation` (
+  `help_topic_id` int(10) unsigned NOT NULL,
+  `help_keyword_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`help_keyword_id`,`help_topic_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='keyword-topic relation'
+
+mysql.help_topic
+CREATE TABLE `help_topic` (
+  `help_topic_id` int(10) unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  `help_category_id` smallint(5) unsigned NOT NULL,
+  `description` text NOT NULL,
+  `example` text NOT NULL,
+  `url` char(128) NOT NULL,
+  PRIMARY KEY (`help_topic_id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='help topics'
+
+mysql.ndb_binlog_index
+CREATE TABLE `ndb_binlog_index` (
+  `Position` bigint(20) unsigned NOT NULL,
+  `File` varchar(255) NOT NULL,
+  `epoch` bigint(20) unsigned NOT NULL,
+  `inserts` int(10) unsigned NOT NULL,
+  `updates` int(10) unsigned NOT NULL,
+  `deletes` int(10) unsigned NOT NULL,
+  `schemaops` int(10) unsigned NOT NULL,
+  `orig_server_id` int(10) unsigned NOT NULL,
+  `orig_epoch` bigint(20) unsigned NOT NULL,
+  `gci` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`epoch`,`orig_server_id`,`orig_epoch`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+
+mysql.plugin
+CREATE TABLE `plugin` (
+  `name` varchar(64) NOT NULL DEFAULT '',
+  `dl` varchar(128) NOT NULL DEFAULT '',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL plugins'
+
+mysql.proc
+CREATE TABLE `proc` (
+  `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) NOT NULL DEFAULT '',
+  `type` enum('FUNCTION','PROCEDURE') NOT NULL,
+  `specific_name` char(64) NOT NULL DEFAULT '',
+  `language` enum('SQL') NOT NULL DEFAULT 'SQL',
+  `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL',
+  `is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO',
+  `security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER',
+  `param_list` blob NOT NULL,
+  `returns` longblob NOT NULL,
+  `body` longblob NOT NULL,
+  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
+  `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `body_utf8` longblob,
+  PRIMARY KEY (`db`,`name`,`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
+
+mysql.procs_priv
+CREATE TABLE `procs_priv` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL,
+  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`),
+  KEY `Grantor` (`Grantor`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
+
+mysql.proxies_priv
+CREATE TABLE `proxies_priv` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Proxied_user` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `With_grant` tinyint(1) NOT NULL DEFAULT '0',
+  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`),
+  KEY `Grantor` (`Grantor`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User proxy privileges'
+
+mysql.servers
+CREATE TABLE `servers` (
+  `Server_name` char(64) NOT NULL DEFAULT '',
+  `Host` char(64) NOT NULL DEFAULT '',
+  `Db` char(64) NOT NULL DEFAULT '',
+  `Username` char(64) NOT NULL DEFAULT '',
+  `Password` char(64) NOT NULL DEFAULT '',
+  `Port` int(4) NOT NULL DEFAULT '0',
+  `Socket` char(64) NOT NULL DEFAULT '',
+  `Wrapper` char(64) NOT NULL DEFAULT '',
+  `Owner` char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`Server_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL Foreign Servers table'
+
+mysql.tables_priv
+CREATE TABLE `tables_priv` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
+  KEY `Grantor` (`Grantor`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges'
+
+mysql.time_zone
+CREATE TABLE `time_zone` (
+  `Time_zone_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `Use_leap_seconds` enum('Y','N') NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Time_zone_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zones'
+
+mysql.time_zone_leap_second
+CREATE TABLE `time_zone_leap_second` (
+  `Transition_time` bigint(20) NOT NULL,
+  `Correction` int(11) NOT NULL,
+  PRIMARY KEY (`Transition_time`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Leap seconds information for time zones'
+
+mysql.time_zone_name
+CREATE TABLE `time_zone_name` (
+  `Name` char(64) NOT NULL,
+  `Time_zone_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`Name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone names'
+
+mysql.time_zone_transition
+CREATE TABLE `time_zone_transition` (
+  `Time_zone_id` int(10) unsigned NOT NULL,
+  `Transition_time` bigint(20) NOT NULL,
+  `Transition_type_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`Time_zone_id`,`Transition_time`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transitions'
+
+mysql.time_zone_transition_type
+CREATE TABLE `time_zone_transition_type` (
+  `Time_zone_id` int(10) unsigned NOT NULL,
+  `Transition_type_id` int(10) unsigned NOT NULL,
+  `Offset` int(11) NOT NULL DEFAULT '0',
+  `Is_DST` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Abbreviation` char(8) NOT NULL DEFAULT '',
+  PRIMARY KEY (`Time_zone_id`,`Transition_type_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transition types'
+
+mysql.user
+CREATE TABLE `user` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `ssl_cipher` blob NOT NULL,
+  `x509_issuer` blob NOT NULL,
+  `x509_subject` blob NOT NULL,
+  `max_questions` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_updates` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
+  `plugin` char(64) COLLATE utf8_bin DEFAULT '',
+  `authentication_string` text COLLATE utf8_bin,
+  `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Host`,`User`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
+
+percona_test.checksums
+CREATE TABLE `checksums` (
+  `db_tbl` varchar(128) NOT NULL,
+  `checksum` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`db_tbl`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+
+percona_test.load_data
+CREATE TABLE `load_data` (
+  `i` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+
+percona_test.sentinel
+CREATE TABLE `sentinel` (
+  `id` int(11) NOT NULL,
+  `ping` varchar(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+
+sakila.actor
+CREATE TABLE `actor` (
+  `actor_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`actor_id`),
+  KEY `idx_actor_last_name` (`last_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8
+
+sakila.address
+CREATE TABLE `address` (
+  `address_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `address` varchar(50) NOT NULL,
+  `address2` varchar(50) DEFAULT NULL,
+  `district` varchar(20) NOT NULL,
+  `city_id` smallint(5) unsigned NOT NULL,
+  `postal_code` varchar(10) DEFAULT NULL,
+  `phone` varchar(20) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`address_id`),
+  KEY `idx_fk_city_id` (`city_id`),
+  CONSTRAINT `fk_address_city` FOREIGN KEY (`city_id`) REFERENCES `city` (`city_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=606 DEFAULT CHARSET=utf8
+
+sakila.category
+CREATE TABLE `category` (
+  `category_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(25) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`category_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8
+
+sakila.city
+CREATE TABLE `city` (
+  `city_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `city` varchar(50) NOT NULL,
+  `country_id` smallint(5) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`city_id`),
+  KEY `idx_fk_country_id` (`country_id`),
+  CONSTRAINT `fk_city_country` FOREIGN KEY (`country_id`) REFERENCES `country` (`country_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=601 DEFAULT CHARSET=utf8
+
+sakila.country
+CREATE TABLE `country` (
+  `country_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `country` varchar(50) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`country_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8
+
+sakila.customer
+CREATE TABLE `customer` (
+  `customer_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `store_id` tinyint(3) unsigned NOT NULL,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `email` varchar(50) DEFAULT NULL,
+  `address_id` smallint(5) unsigned NOT NULL,
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `create_date` datetime NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`customer_id`),
+  KEY `idx_fk_store_id` (`store_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  KEY `idx_last_name` (`last_name`),
+  CONSTRAINT `fk_customer_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_customer_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=600 DEFAULT CHARSET=utf8
+
+sakila.film
+CREATE TABLE `film` (
+  `film_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) NOT NULL,
+  `description` text,
+  `release_year` year(4) DEFAULT NULL,
+  `language_id` tinyint(3) unsigned NOT NULL,
+  `original_language_id` tinyint(3) unsigned DEFAULT NULL,
+  `rental_duration` tinyint(3) unsigned NOT NULL DEFAULT '3',
+  `rental_rate` decimal(4,2) NOT NULL DEFAULT '4.99',
+  `length` smallint(5) unsigned DEFAULT NULL,
+  `replacement_cost` decimal(5,2) NOT NULL DEFAULT '19.99',
+  `rating` enum('G','PG','PG-13','R','NC-17') DEFAULT 'G',
+  `special_features` set('Trailers','Commentaries','Deleted Scenes','Behind the Scenes') DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`film_id`),
+  KEY `idx_title` (`title`),
+  KEY `idx_fk_language_id` (`language_id`),
+  KEY `idx_fk_original_language_id` (`original_language_id`),
+  CONSTRAINT `fk_film_language` FOREIGN KEY (`language_id`) REFERENCES `language` (`language_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_language_original` FOREIGN KEY (`original_language_id`) REFERENCES `language` (`language_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8
+
+sakila.film_actor
+CREATE TABLE `film_actor` (
+  `actor_id` smallint(5) unsigned NOT NULL,
+  `film_id` smallint(5) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`actor_id`,`film_id`),
+  KEY `idx_fk_film_id` (`film_id`),
+  CONSTRAINT `fk_film_actor_actor` FOREIGN KEY (`actor_id`) REFERENCES `actor` (`actor_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_actor_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+
+sakila.film_category
+CREATE TABLE `film_category` (
+  `film_id` smallint(5) unsigned NOT NULL,
+  `category_id` tinyint(3) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`film_id`,`category_id`),
+  KEY `fk_film_category_category` (`category_id`),
+  CONSTRAINT `fk_film_category_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_category_category` FOREIGN KEY (`category_id`) REFERENCES `category` (`category_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+
+sakila.film_text
+CREATE TABLE `film_text` (
+  `film_id` smallint(6) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY (`film_id`),
+  FULLTEXT KEY `idx_title_description` (`title`,`description`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+
+sakila.inventory
+CREATE TABLE `inventory` (
+  `inventory_id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `film_id` smallint(5) unsigned NOT NULL,
+  `store_id` tinyint(3) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`inventory_id`),
+  KEY `idx_fk_film_id` (`film_id`),
+  KEY `idx_store_id_film_id` (`store_id`,`film_id`),
+  CONSTRAINT `fk_inventory_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_inventory_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=4582 DEFAULT CHARSET=utf8
+
+sakila.language
+CREATE TABLE `language` (
+  `language_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(20) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`language_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8
+
+sakila.payment
+CREATE TABLE `payment` (
+  `payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `customer_id` smallint(5) unsigned NOT NULL,
+  `staff_id` tinyint(3) unsigned NOT NULL,
+  `rental_id` int(11) DEFAULT NULL,
+  `amount` decimal(5,2) NOT NULL,
+  `payment_date` datetime NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`payment_id`),
+  KEY `idx_fk_staff_id` (`staff_id`),
+  KEY `idx_fk_customer_id` (`customer_id`),
+  KEY `fk_payment_rental` (`rental_id`),
+  CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8
+
+sakila.rental
+CREATE TABLE `rental` (
+  `rental_id` int(11) NOT NULL AUTO_INCREMENT,
+  `rental_date` datetime NOT NULL,
+  `inventory_id` mediumint(8) unsigned NOT NULL,
+  `customer_id` smallint(5) unsigned NOT NULL,
+  `return_date` datetime DEFAULT NULL,
+  `staff_id` tinyint(3) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rental_id`),
+  UNIQUE KEY `rental_date` (`rental_date`,`inventory_id`,`customer_id`),
+  KEY `idx_fk_inventory_id` (`inventory_id`),
+  KEY `idx_fk_customer_id` (`customer_id`),
+  KEY `idx_fk_staff_id` (`staff_id`),
+  CONSTRAINT `fk_rental_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_rental_inventory` FOREIGN KEY (`inventory_id`) REFERENCES `inventory` (`inventory_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_rental_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8
+
+sakila.staff
+CREATE TABLE `staff` (
+  `staff_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `address_id` smallint(5) unsigned NOT NULL,
+  `picture` blob,
+  `email` varchar(50) DEFAULT NULL,
+  `store_id` tinyint(3) unsigned NOT NULL,
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `username` varchar(16) NOT NULL,
+  `password` varchar(40) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`staff_id`),
+  KEY `idx_fk_store_id` (`store_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  CONSTRAINT `fk_staff_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_staff_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8
+
+sakila.store
+CREATE TABLE `store` (
+  `store_id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+  `manager_staff_id` tinyint(3) unsigned NOT NULL,
+  `address_id` smallint(5) unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`store_id`),
+  UNIQUE KEY `idx_unique_manager` (`manager_staff_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  CONSTRAINT `fk_store_staff` FOREIGN KEY (`manager_staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_store_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8
+

=== renamed file 't/lib/samples/SchemaIterator/mysql-user-ddl.txt' => 't/lib/samples/SchemaIterator/mysql-user-ddl-5.1.txt'
=== added file 't/lib/samples/SchemaIterator/mysql-user-ddl-5.6.txt'
--- t/lib/samples/SchemaIterator/mysql-user-ddl-5.6.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/SchemaIterator/mysql-user-ddl-5.6.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,48 @@
+mysql.user
+CREATE TABLE `user` (
+  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `ssl_cipher` blob NOT NULL,
+  `x509_issuer` blob NOT NULL,
+  `x509_subject` blob NOT NULL,
+  `max_questions` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_updates` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
+  `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
+  `plugin` char(64) COLLATE utf8_bin DEFAULT '',
+  `authentication_string` text COLLATE utf8_bin,
+  `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Host`,`User`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
+

=== added file 't/lib/samples/stored-objs.sql'
--- t/lib/samples/stored-objs.sql	1970-01-01 00:00:00 +0000
+++ t/lib/samples/stored-objs.sql	2012-12-20 23:20:32 +0000
@@ -0,0 +1,30 @@
+DROP DATABASE IF EXISTS pt_find;
+CREATE DATABASE pt_find;
+USE pt_find;
+
+create table t1 (
+  id int not null primary key
+) engine=innodb;
+
+create table t2 (
+  id int not null primary key
+) engine=innodb;
+
+CREATE FUNCTION hello (s CHAR(20))
+RETURNS CHAR(50) DETERMINISTIC
+RETURN CONCAT('Hello, ',s,'!');
+
+delimiter //
+
+CREATE PROCEDURE simpleproc (OUT param1 INT)
+BEGIN
+  SELECT COUNT(*) INTO param1 FROM t;
+END//
+
+CREATE TRIGGER ins_trg BEFORE INSERT ON t1
+  FOR EACH ROW BEGIN
+    INSERT INTO t2 VALUES (NEW.id);
+  END;
+//
+
+delimiter ;

=== modified file 't/pt-archiver/standard_options.t'
--- t/pt-archiver/standard_options.t	2012-06-07 03:14:20 +0000
+++ t/pt-archiver/standard_options.t	2012-12-20 23:20:32 +0000
@@ -23,101 +23,127 @@
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 7;
+elsif ( !$dbh2 ) {
+   plan skip_all => 'Cannot connect to sandbox slave';
 }
 
 my $output;
-my $cnf = "/tmp/12345/my.sandbox.cnf";
-my $cmd = "$trunk/bin/pt-archiver";
+my $cnf      = "/tmp/12345/my.sandbox.cnf";
+my $pid_file = "/tmp/pt-archiver-test.pid.$PID";
+my $sentinel = "/tmp/pt-archiver-test.sentinel.$PID";
 
 $sb->create_dbs($dbh, [qw(test)]);
 
-SKIP: {
-   skip 'Sandbox master does not have the sakila database', 1
-      unless @{$dbh->selectcol_arrayref("SHOW DATABASES LIKE 'sakila'")};
-
-   $output = `$cmd --source F=$cnf,h=127.1,D=sakila,t=film --no-check-charset  --where "film_id < 100" --purge --dry-run --port 12345 | diff $trunk/t/pt-archiver/samples/issue-248.txt -`;
-   is(
-      $output,
-      '',
-      'DSNs inherit from standard connection options (issue 248)'
-   );
-};
-
+ok(
+   no_diff(
+      sub {
+         pt_archiver::main('--source', "F=$cnf,h=127.1,D=sakila,t=film",
+            qw(--no-check-charset --purge --dry-run --port 12345),
+            "--where", "film_id < 100")
+      },
+      "t/pt-archiver/samples/issue-248.txt",
+   ),
+   'DSNs inherit from standard connection options (issue 248)'
+);
 
 # Test with a sentinel file
 $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
-diag(`touch sentinel`);
+diag(`touch $sentinel`);
+
 $output = output(
-   sub { pt_archiver::main(qw(--where 1=1 --why-quit --sentinel sentinel), "--source", "D=test,t=table_1,F=$cnf", qw(--purge)) },
-);
-like($output, qr/because sentinel/, 'Exits because of sentinel');
+   sub { pt_archiver::main("--source", "D=test,t=table_1,F=$cnf",
+      qw(--where 1=1 --why-quit --purge),
+      "--sentinel", $sentinel)
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/because sentinel file $sentinel exists/,
+   'Exits because of sentinel'
+);
+
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
-is($output + 0, 4, 'No rows were deleted');
-`rm sentinel`;
+is(
+   $output + 0,
+   4,
+   'No rows were deleted'
+) or diag($output);
+
+diag(`rm -f $sentinel`);
 
 # Test --stop, which sets the sentinel
 $output = output(
-   sub { pt_archiver::main(qw(--sentinel sentinel --stop)) },
-);
-like($output, qr/Successfully created file sentinel/, 'Created the sentinel OK');
-diag(`rm -f sentinel >/dev/null`);
+   sub { pt_archiver::main("--sentinel", $sentinel, "--stop") },
+);
+
+like(
+   $output,
+   qr/Successfully created file $sentinel/,
+   'Created the sentinel OK'
+);
+
+diag(`rm -f $sentinel`);
 
 # #############################################################################
 # Issue 391: Add --pid option to mk-table-sync
 # #############################################################################
-`touch /tmp/mk-archiver.pid`;
-$output = `$cmd --where 1=1 --source F=$cnf,D=test,t=issue_131_src --statistics --dest t=issue_131_dst --pid /tmp/mk-archiver.pid 2>&1`;
+diag(`touch $pid_file`);
+
+$output = output(
+   sub { pt_archiver::main('--source', "F=$cnf,D=test,t=issue_131_src",
+      qw(--where 1=1 --statistics --dest t=issue_131_dst),
+      "--pid", $pid_file)
+   },
+   stderr => 1,
+);
+
 like(
    $output,
-   qr{PID file /tmp/mk-archiver.pid already exists},
+   qr{PID file $pid_file already exists},
    'Dies if PID file already exists (issue 391)'
 );
 
-`rm -rf /tmp/mk-archiver.pid`;
+diag(`rm -f $pid_file`);
 
 # #############################################################################
 # Issue 460: mk-archiver does not inherit DSN as documented 
 # #############################################################################
-SKIP: {
-   skip 'Cannot connect to sandbox slave1', 1 unless $dbh2;
-
-   # This test will achive rows from dbh:test.table_1 to dbh2:test.table_2.
-   $sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
-
-   # Change passwords so defaults files won't work.
-   $dbh->do("SET PASSWORD FOR msandbox = PASSWORD('foo')");
-   $dbh2->do("SET PASSWORD FOR msandbox = PASSWORD('foo')");
-
-   $dbh2->do('TRUNCATE TABLE test.table_2');
-
-   $output = `$trunk/bin/pt-archiver --where 1=1 --source h=127.1,P=12345,D=test,t=table_1,u=msandbox,p=foo --dest P=12346,t=table_2 2>&1`;
-   my $r = $dbh2->selectall_arrayref('SELECT * FROM test.table_2');
-   is(
-      scalar @$r,
-      4,
-      '--dest inherited from --source'
-   );
-
-   # Set the passwords back.  If this fails we should bail out because
-   # nothing else is going to work.
-   eval {
-      $dbh->do("SET PASSWORD FOR msandbox = PASSWORD('msandbox')");
-      $dbh2->do("SET PASSWORD FOR msandbox = PASSWORD('msandbox')");
-   };
-   if ( $EVAL_ERROR ) {
-      BAIL_OUT('Failed to reset the msandbox password on the master or slave '
-         . 'sandbox.  Check the Maatkit test environment with "test-env '
-         . 'status" and restart with "test-env restart".  The error was: '
-         . $EVAL_ERROR);
-   }
-};
+
+# This test will achive rows from dbh:test.table_1 to dbh2:test.table_2.
+$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+
+# Change passwords so defaults files won't work.
+$sb->do_as_root(
+   'master',
+   q/CREATE USER 'bob'@'%' IDENTIFIED BY 'foo'/,
+   q/GRANT ALL ON *.* TO 'bob'@'%'/,
+);
+$dbh2->do('TRUNCATE TABLE test.table_2');
+$sb->wait_for_slaves;
+
+$output = output(
+   sub { pt_archiver::main(
+      '--source', 'h=127.1,P=12345,D=test,t=table_1,u=bob,p=foo',
+      '--dest',   'P=12346,t=table_2',
+      qw(--where 1=1))
+   },
+   stderr => 1,
+);
+
+my $r = $dbh2->selectall_arrayref('SELECT * FROM test.table_2');
+is(
+   scalar @$r,
+   4,
+   '--dest inherited from --source'
+);
+
+$sb->do_as_root('master', q/DROP USER 'bob'@'%'/);
 
 # #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
-$sb->wipe_clean($dbh2) if $dbh2;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== added file 't/pt-config-diff/samples/case1.cnf'
--- t/pt-config-diff/samples/case1.cnf	1970-01-01 00:00:00 +0000
+++ t/pt-config-diff/samples/case1.cnf	2012-12-20 23:20:32 +0000
@@ -0,0 +1,2 @@
+[mysqld]
+binlog_format = genlog

=== added file 't/pt-config-diff/samples/case2.cnf'
--- t/pt-config-diff/samples/case2.cnf	1970-01-01 00:00:00 +0000
+++ t/pt-config-diff/samples/case2.cnf	2012-12-20 23:20:32 +0000
@@ -0,0 +1,2 @@
+[mysqld]
+binlog_format = GENLOG

=== modified file 't/pt-deadlock-logger/bugs.t'
--- t/pt-deadlock-logger/bugs.t	2012-06-03 18:47:00 +0000
+++ t/pt-deadlock-logger/bugs.t	2012-12-20 23:20:32 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 1;
+use Test::More;
 
 use PerconaTest;
 use Sandbox;
@@ -68,6 +68,59 @@
 );
 
 # #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1082104
+# pt-deadlock-logger problem when the user have a dash in the name
+# #############################################################################
+
+$innodb_status_sample = load_file("t/pt-deadlock-logger/samples/bug_1082104.txt");
+
+is_deeply(
+   pt_deadlock_logger::parse_deadlocks($innodb_status_sample),
+   {
+      '1' => {
+          db => 'test',
+          hostname => 'localhost',
+          id => 1,
+          idx => 'PRIMARY',
+          ip => '',
+          lock_mode => 'X',
+          lock_type => 'RECORD',
+          query => 'update a set movie_id=96 where id =2',
+          server => '',
+          tbl => 'a',
+          thread => '19',
+          ts => '2011-12-12T22:52:42',
+          txn_id => 0,
+          txn_time => '161',
+          user => 'ro-ot',
+          victim => 0,
+          wait_hold => 'w'
+      },
+      '2' => {
+          db => 'test',
+          hostname => 'localhost',
+          id => 2,
+          idx => 'PRIMARY',
+          ip => '',
+          lock_mode => 'X',
+          lock_type => 'RECORD',
+          query => 'update a set movie_id=98 where id =4',
+          server => '',
+          tbl => 'a',
+          thread => '18',
+          ts => '2011-12-12T22:52:42',
+          txn_id => 0,
+          txn_time => '1026',
+          user => 'ro-ot',
+          victim => 1,
+          wait_hold => 'w'
+      }
+   },
+   "Bug 1082104: pt-deadlock-logger shows host as user when the username has a dash in the name",
+);
+
+# #############################################################################
 # Done.
 # #############################################################################
+done_testing;
 exit;

=== added file 't/pt-deadlock-logger/samples/bug_1082104.txt'
--- t/pt-deadlock-logger/samples/bug_1082104.txt	1970-01-01 00:00:00 +0000
+++ t/pt-deadlock-logger/samples/bug_1082104.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,53 @@
+=====================================
+070915 15:34:37 INNODB MONITOR OUTPUT
+=====================================
+Per second averages calculated from the last 24 seconds
+------------------------
+LATEST DETECTED DEADLOCK
+------------------------
[phone]:52:42
+*** (1) TRANSACTION:
+TRANSACTION 3405, ACTIVE 161 sec starting index read
+mysql tables in use 1, locked 1
+LOCK WAIT 3 lock struct(s), heap size 376, 3 row lock(s), undo log entries 2
+MySQL thread id 19, OS thread handle 0x7fac301e4700, query id 180 localhost ro-ot Updating
+update a set movie_id=96 where id =2
+*** (1) WAITING FOR THIS LOCK TO BE GRANTED:
+RECORD LOCKS space id 0 page no 307 n bits 72 index `PRIMARY` of table `test`.`a` trx id 3405 lock_mode X locks rec but not gap waiting
+Record lock, heap no 3 PHYSICAL RECORD: n_fields 6; compact format; info bits 0
+ 0: len 4; hex 80000002; asc ;;
+ 1: len 6; hex 000000003404; asc 4 ;;
+ 2: len 7; hex 040000163b2515; asc ;% ;;
+ 3: len 4; hex 80000063; asc c;;
+ 4: len 1; hex 01; asc ;;
+ 5: len 8; hex 8000124a7c1acb8c; asc J| ;;
+
+*** (2) TRANSACTION:
+TRANSACTION 3404, ACTIVE 1026 sec starting index read
+mysql tables in use 1, locked 1
+3 lock struct(s), heap size 376, 2 row lock(s), undo log entries 1
+MySQL thread id 18, OS thread handle 0x7fac30225700, query id 181 localhost ro-ot Updating
+update a set movie_id=98 where id =4
+*** (2) HOLDS THE LOCK(S):
+RECORD LOCKS space id 0 page no 307 n bits 72 index `PRIMARY` of table `test`.`a` trx id 3404 lock_mode X locks rec but not gap
+Record lock, heap no 3 PHYSICAL RECORD: n_fields 6; compact format; info bits 0
+ 0: len 4; hex 80000002; asc ;;
+ 1: len 6; hex 000000003404; asc 4 ;;
+ 2: len 7; hex 040000163b2515; asc ;% ;;
+ 3: len 4; hex 80000063; asc c;;
+ 4: len 1; hex 01; asc ;;
+ 5: len 8; hex 8000124a7c1acb8c; asc J| ;;
+
+*** (2) WAITING FOR THIS LOCK TO BE GRANTED:
+RECORD LOCKS space id 0 page no 307 n bits 72 index `PRIMARY` of table `test`.`a` trx id 3404 lock_mode X locks rec but not gap waiting
+Record lock, heap no 5 PHYSICAL RECORD: n_fields 6; compact format; info bits 0
+ 0: len 4; hex 80000004; asc ;;
+ 1: len 6; hex 000000003405; asc 4 ;;
+ 2: len 7; hex 0500000e7017e8; asc p ;;
+ 3: len 4; hex 80000062; asc b;;
+ 4: len 1; hex 01; asc ;;
+ 5: len 8; hex 8000124a7c1acbb6; asc J| ;;
+
+*** WE ROLL BACK TRANSACTION (2)
+END OF INNODB MONITOR OUTPUT
+============================

=== modified file 't/pt-find/pt-find.t'
--- t/pt-find/pt-find.t	2012-12-07 22:46:51 +0000
+++ t/pt-find/pt-find.t	2012-12-20 23:20:32 +0000
@@ -22,9 +22,8 @@
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 23;
-}
+
+$sb->load_file('master', 't/lib/samples/stored-objs.sql');
 
 my $output;
 my $cnf = '/tmp/12345/my.sandbox.cnf';
@@ -111,6 +110,80 @@
       "--view that doesn't match"
    );
 
+   # Test --procedure.
+   $output = `$cmd pt_find --procedure param1 --print`;
+   is(
+      $output,
+      "`pt_find`.`PROCEDURE simpleproc`\n",
+      '--procedure that matches'
+   );
+
+   $output = `$cmd pt_find --procedure blah  --print`;
+   is(
+      $output,
+      '',
+      "--procedure that doesn't match"
+   );
+
+   # Test --function.
+   $output = `$cmd pt_find --function Hello --print`;
+   is(
+      $output,
+      "`pt_find`.`FUNCTION hello`\n",
+      '--function that matches'
+   );
+
+   $output = `$cmd pt_find --function blah  --print`;
+   is(
+      $output,
+      '',
+      "--function that doesn't match"
+   );
+
+   # Test --trigger without --trigger-table.
+   $output = `$cmd pt_find --trigger 'INSERT INTO t2' --print`;
+   is(
+      $output,
+      "`pt_find`.`INSERT TRIGGER ins_trg on t1`\n",
+      '--trigger that matches without --trigger-table'
+   );
+
+   $output = `$cmd pt_find --trigger blah  --print`;
+   is(
+      $output,
+      '',
+      "--trigger that doesn't match without --trigger-table"
+   );
+
+   # Test --trigger with --trigger-table.
+   $output = `$cmd pt_find --trigger 'INSERT INTO t2' --trigger-table t1 --print`;
+   is(
+      $output,
+      "`pt_find`.`INSERT TRIGGER ins_trg on t1`\n",
+      '--trigger that matches with matching --trigger-table'
+   );
+
+   $output = `$cmd pt_find --trigger blah --trigger-table t1 --print`;
+   is(
+      $output,
+      '',
+      "--trigger that doesn't match with matching --trigger-table"
+   );
+
+   $output = `$cmd pt_find --trigger 'INSERT INTO t2' --trigger-table foo --print`;
+   is(
+      $output,
+      '',
+      '--trigger that matches with non-matching --trigger-table'
+   );
+
+   $output = `$cmd pt_find --trigger blah --trigger-table foo --print`;
+   is(
+      $output,
+      '',
+      "--trigger that doesn't match with non-matching --trigger-table"
+   );
+
    # Test NULL sizes.
    $output = `$cmd sakila  --datasize NULL`,
    is(
@@ -223,4 +296,5 @@
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
 exit;

=== added file 't/pt-heartbeat/bugs.t'
--- t/pt-heartbeat/bugs.t	1970-01-01 00:00:00 +0000
+++ t/pt-heartbeat/bugs.t	2012-12-20 23:20:32 +0000
@@ -0,0 +1,115 @@
+#!/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 POSIX qw( tzset );
+use File::Temp qw(tempfile);
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-heartbeat";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master');
+my $slave1_dbh = $sb->get_dbh_for('slave1');
+my $slave2_dbh = $sb->get_dbh_for('slave2');
+
+if ( !$master_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master';
+}
+elsif ( !$slave1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave1';
+}
+elsif ( !$slave2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave2';
+}
+
+unlink '/tmp/pt-heartbeat-sentinel';
+$sb->create_dbs($master_dbh, ['test']);
+$sb->wait_for_slaves();
+
+my $output;
+my $base_pidfile = (tempfile("/tmp/pt-heartbeat-test.XXXXXXXX", OPEN => 0, UNLINK => 0))[1];
+my $master_port = $sb->port_for('master');
+
+my @exec_pids;
+my @pidfiles;
+
+sub start_update_instance {
+   my ($port) = @_;
+   my $pidfile = "$base_pidfile.$port.pid";
+   push @pidfiles, $pidfile;
+
+   my $pid = fork();
+   if ( $pid == 0 ) {
+      my $cmd = "$trunk/bin/pt-heartbeat";
+      exec { $cmd } $cmd, qw(-h 127.0.0.1 -u msandbox -p msandbox -P), $port,
+                          qw(--database test --table heartbeat --create-table),
+                          qw(--update --interval 0.5 --pid), $pidfile;
+      exit 1;
+   }
+   push @exec_pids, $pid;
+   
+   PerconaTest::wait_for_files($pidfile);
+   ok(
+      -f $pidfile,
+      "--update on $port started"
+   );
+}
+
+sub stop_all_instances {
+   my @pids = @exec_pids, map { chomp; $_ } map { slurp_file($_) } @pidfiles;
+   diag(`$trunk/bin/pt-heartbeat --stop >/dev/null`);
+
+   waitpid($_, 0) for @pids;
+   PerconaTest::wait_until(sub{ !-e $_ }) for @pidfiles;
+
+   unlink '/tmp/pt-heartbeat-sentinel';
+}
+
+# ############################################################################
+# pt-heartbeat handles timezones inconsistently
+# https://bugs.launchpad.net/percona-toolkit/+bug/886059
+# ############################################################################
+
+start_update_instance( $master_port );
+
+PerconaTest::wait_for_table($slave1_dbh, 'test.heartbeat', 'server_id=12345');
+
+my $slave1_dsn = $sb->dsn_for('slave1');
+# Using full_output here to work around a Perl bug: Only the first explicit
+# tzset works.
+($output) = full_output(sub {
+   local $ENV{TZ} = '-09:00';
+   tzset();
+   pt_heartbeat::main($slave1_dsn, qw(--database test --table heartbeat),
+                        qw(--check --master-server-id), $master_port)
+});
+
+# If the servers use UTC then the lag should be 0.00, or at least
+# no greater than 9.99 for slow test boxes.  When this fails, the
+# lag is like 25200.00 becaues the servers are hours off.
+like(
+   $output,
+   qr/\A\d.\d{2}$/,
+   "Bug 886059: pt-heartbeat doesn't get confused with differing timezones"
+);
+
+stop_all_instances();
+
+# ############################################################################
+# Done.
+# ############################################################################
+$sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

=== added file 't/pt-heartbeat/pxc.t'
--- t/pt-heartbeat/pxc.t	1970-01-01 00:00:00 +0000
+++ t/pt-heartbeat/pxc.t	2012-12-20 23:20:32 +0000
@@ -0,0 +1,388 @@
+#!/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 Data::Dumper;
+
+use File::Temp qw(tempfile);
+
+use PerconaTest;
+use Sandbox;
+
+require "$trunk/bin/pt-heartbeat";
+# Do this after requiring pt-hb, since it uses Mo
+require VersionParser;
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $node1 = $sb->get_dbh_for('node1');
+my $node2 = $sb->get_dbh_for('node2');
+my $node3 = $sb->get_dbh_for('node3');
+
+if ( !$node1 ) {
+   plan skip_all => 'Cannot connect to cluster node1';
+}
+elsif ( !$node2 ) {
+   plan skip_all => 'Cannot connect to cluster node2';
+}
+elsif ( !$node3 ) {
+   plan skip_all => 'Cannot connect to cluster node3';
+}
+
+my $db_flavor = VersionParser->new($node1)->flavor();
+if ( $db_flavor !~ /XtraDB Cluster/ ) {
+   plan skip_all => "PXC tests";
+}
+
+my $node1_dsn  = $sb->dsn_for('node1');
+my $node2_dsn  = $sb->dsn_for('node2');
+my $node3_dsn  = $sb->dsn_for('node3');
+my $node1_port = $sb->port_for('node1');
+my $node2_port = $sb->port_for('node2');
+my $node3_port = $sb->port_for('node3');
+
+my $output;
+my $exit;
+my $base_pidfile = (tempfile("/tmp/pt-heartbeat-test.XXXXXXXX", OPEN => 0, UNLINK => 0))[1];
+my $sample = "t/pt-heartbeat/samples/";
+
+my $sentinel = '/tmp/pt-heartbeat-sentinel';
+
+# Remove any leftover instances
+diag(`$trunk/bin/pt-heartbeat --stop >/dev/null`);
+sleep 1;
+
+diag(`rm -rf $sentinel >/dev/null 2>&1`);
+$sb->create_dbs($node1, ['test']);
+
+my @exec_pids;
+my @pidfiles;
+
+sub start_update_instance {
+   my ($port) = @_;
+   my $pidfile = "$base_pidfile.$port.pid";
+   push @pidfiles, $pidfile;
+
+   my $pid = fork();
+   die "Cannot fork: $OS_ERROR" unless defined $pid;
+   if ( $pid == 0 ) {
+      my $cmd = "$trunk/bin/pt-heartbeat";
+      exec { $cmd } $cmd, qw(-h 127.0.0.1 -u msandbox -p msandbox -P), $port,
+                          qw(--database test --table heartbeat --create-table),
+                          qw(--update --interval 0.5 --pid), $pidfile;
+      exit 1;
+   }
+   push @exec_pids, $pid;
+   
+   PerconaTest::wait_for_files($pidfile);
+   ok(
+      -f $pidfile,
+      "--update on $port started"
+   );
+}
+
+sub stop_all_instances {
+   my @pids = @exec_pids, map { chomp; $_ } map { slurp_file($_) } @pidfiles;
+   diag(`$trunk/bin/pt-heartbeat --stop >/dev/null`);
+
+   waitpid($_, 0) for @pids;
+   PerconaTest::wait_until(sub{ !-e $_ }) for @pidfiles;
+
+   unlink $sentinel;
+}
+
+foreach my $port ( map { $sb->port_for($_) } qw(node1 node2 node3) ) {
+   start_update_instance($port);
+}
+
+# #############################################################################
+# Basic cluster tests
+# #############################################################################
+
+my $rows = $node1->selectall_hashref("select * from test.heartbeat", 'server_id');
+
+is(
+   scalar keys %$rows,
+   3,
+   "Sanity check: All nodes are in the heartbeat table"
+);
+
+my $only_slave_data = {
+   map {
+      $_ => {
+         relay_master_log_file => $rows->{$_}->{relay_master_log_file},
+         exec_master_log_pos   => $rows->{$_}->{exec_master_log_pos},
+      } } keys %$rows
+};
+
+my $same_data = { relay_master_log_file => undef, exec_master_log_pos => undef };
+is_deeply(
+   $only_slave_data,
+   {
+      12345 => $same_data,
+      12346 => $same_data,
+      12347 => $same_data,
+   },
+   "Sanity check: No slave data (relay log or master pos) is stored"
+);
+
+$output = output(sub{
+      pt_heartbeat::main($node1_dsn, qw(-D test --check)),
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/\QThe --master-server-id option must be specified because the heartbeat table `test`.`heartbeat`/,
+   "pt-heartbeat --check + PXC doesn't autodetect a master if there isn't any"
+);
+
+$output = output(sub{
+      pt_heartbeat::main($node1_dsn, qw(-D test --check),
+                         '--master-server-id', $node3_port),
+   },
+   stderr => 1,
+);
+
+$output =~ s/\d\.\d{2}/0.00/g;
+is(
+   $output,
+   "0.00\n",
+   "pt-heartbeat --check + PXC works with --master-server-id"
+);
+
+# Test --monitor
+
+$output = output(sub {
+   pt_heartbeat::main($node1_dsn,
+      qw(-D test --monitor --run-time 1s),
+      '--master-server-id', $node3_port)
+   },
+   stderr => 1,
+);
+
+$output =~ s/\d\.\d{2}/0.00/g;
+is(
+   $output,
+   "0.00s [  0.00s,  0.00s,  0.00s ]\n",
+   "--monitor works"
+);
+
+# Try to generate some lag between cluster nodes. Rather brittle at the moment.
+
+# Lifted from alter active table
+my $pt_osc_sample      = "t/pt-online-schema-change/samples";
+
+my $query_table_stop   = "/tmp/query_table.$PID.stop";
+my $query_table_pid    = "/tmp/query_table.$PID.pid";
+my $query_table_output = "/tmp/query_table.$PID.output";
+
+$sb->create_dbs($node1, ['pt_osc']);
+$sb->load_file('master', "$pt_osc_sample/basic_no_fks_innodb.sql");
+
+$node1->do("USE pt_osc");
+$node1->do("TRUNCATE TABLE t");
+$node1->do("LOAD DATA INFILE '$trunk/$pt_osc_sample/basic_no_fks.data' INTO TABLE t");
+$node1->do("ANALYZE TABLE t");
+$sb->wait_for_slaves();
+
+diag(`rm -rf $query_table_stop`);
+diag(`echo > $query_table_output`);
+
+my $cmd = "$trunk/$pt_osc_sample/query_table.pl";
+system("$cmd 127.0.0.1 $node1_port pt_osc t id $query_table_stop $query_table_pid >$query_table_output 2>&1 &");
+wait_until(sub{-e $query_table_pid});
+
+# Reload sakila
+system "$trunk/sandbox/load-sakila-db $node1_port &";
+
+$output = output(sub {
+   pt_heartbeat::main($node3_dsn,
+      qw(-D test --monitor --run-time 5s),
+      '--master-server-id', $node1_port)
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/^(?:0\.(?:\d[1-9]|[1-9]\d)|\d*[1-9]\d*\.\d{2})s\s+\[/m,
+   "pt-heartbeat can detect replication lag between nodes"
+);
+
+diag(`touch $query_table_stop`);
+chomp(my $p = slurp_file($query_table_pid));
+wait_until(sub{!kill 0, $p});
+
+$node1->do(q{DROP DATABASE pt_osc});
+
+$sb->wait_for_slaves();
+
+# #############################################################################
+# cluster, node1 -> slave, run on node1
+# #############################################################################
+
+my ($slave_dbh, $slave_dsn) = $sb->start_sandbox(
+   server => 'cslave1',
+   type   => 'slave',
+   master => 'node1',
+   env    => q/BINLOG_FORMAT="ROW"/,
+);
+
+$sb->create_dbs($slave_dbh, ['test']);
+
+start_update_instance($sb->port_for('cslave1'));
+PerconaTest::wait_for_table($slave_dbh, "test.heartbeat", "1=1");
+
+$output = output(sub{
+      pt_heartbeat::main($slave_dsn, qw(-D test --check)),
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/\d\.\d{2}\n/,
+   "pt-heartbeat --check works on a slave of a cluster node"
+);
+
+$output = output(sub {
+   pt_heartbeat::main($slave_dsn,
+      qw(-D test --monitor --run-time 2s))
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/^\d.\d{2}s\s+\[/,
+   "pt-heartbeat --monitor + slave of a node1, without --master-server-id"
+);
+
+$output = output(sub {
+   pt_heartbeat::main($slave_dsn,
+      qw(-D test --monitor --run-time 2s),
+      '--master-server-id', $node3_port)
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/^\d.\d{2}s\s+\[/,
+   "pt-heartbeat --monitor + slave of node1, --master-server-id pointing to node3"
+);
+
+# #############################################################################
+# master -> node1 in cluster
+# #############################################################################
+
+# CAREFUL! See the comments in t/pt-table-checksum/pxc.t about cmaster.
+# Nearly everything applies here.
+
+my ($master_dbh, $master_dsn) = $sb->start_sandbox(
+   server => 'cmaster',
+   type   => 'master',
+   env    => q/BINLOG_FORMAT="ROW"/,
+);
+
+my $cmaster_port = $sb->port_for('cmaster');
+
+$sb->create_dbs($master_dbh, ['test']);
+
+$master_dbh->do("FLUSH LOGS");
+$master_dbh->do("RESET MASTER");
+
+$sb->set_as_slave('node1', 'cmaster');
+
+start_update_instance($sb->port_for('cmaster'));
+PerconaTest::wait_for_table($node1, "test.heartbeat", "server_id=$cmaster_port");
+
+$output = output(sub{
+      pt_heartbeat::main($node1_dsn, qw(-D test --check --print-master-server-id)),
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/^\d.\d{2} $cmaster_port$/,
+   "--print-master-id works for master -> $node1_port, when run from $node1_port"
+);
+
+# Wait until node2 & node3 get cmaster in their heartbeat tables
+$sb->wait_for_slaves(master => 'node1', slave => 'node2');
+$sb->wait_for_slaves(master => 'node1', slave => 'node3');
+
+foreach my $test (
+   [ $node2_port, $node2_dsn, $node2 ],
+   [ $node3_port, $node3_dsn, $node3 ],
+) {
+   my ($port, $dsn, $dbh) = @$test;
+   
+   $output = output(sub{
+         pt_heartbeat::main($dsn, qw(-D test --check --print-master-server-id)),
+      },
+      stderr => 1,
+   );
+
+   # This could be made to work, see the node autodiscovery branch
+   TODO: {
+      local $::TODO = "cmaster -> node1, other nodes can't autodetect the master";
+      like(
+         $output,
+         qr/$cmaster_port/,
+         "--print-master-id works for master -> $node1_port, when run from $port"
+      );
+   }
+
+   $output = output(sub{
+         pt_heartbeat::main($dsn, qw(-D test --check --master-server-id), $cmaster_port),
+      },
+      stderr => 1,
+   );
+
+   $output =~ s/\d\.\d{2}/0.00/g;
+   is(
+      $output,
+      "0.00\n",
+      "--check + explicit --master-server-id work for master -> node1, run from $port"
+   );
+}
+
+# ############################################################################
+# Stop the --update instances.
+# ############################################################################
+
+stop_all_instances();
+
+# ############################################################################
+# Disconnect & stop the two servers we started
+# ############################################################################
+
+# We have to do this after the --stop, otherwise the --update processes will
+# spew a bunch of warnings and clog 
+
+$slave_dbh->disconnect;
+$master_dbh->disconnect;
+$sb->stop_sandbox('cslave1', 'cmaster');
+$node1->do("STOP SLAVE");
+$node1->do("RESET SLAVE");
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($node1);
+diag(`/tmp/12345/stop`);
+diag(`/tmp/12345/start`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

=== modified file 't/pt-ioprofile/pt-ioprofile.t'
--- t/pt-ioprofile/pt-ioprofile.t	2012-07-23 15:17:37 +0000
+++ t/pt-ioprofile/pt-ioprofile.t	2012-12-20 23:20:32 +0000
@@ -19,24 +19,22 @@
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('master');
+my $have_strace = `which strace 2>/dev/null`;
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to master sandbox";
 }
-else {
-   plan tests => 5;
+elsif ( !$have_strace ) {
+   plan skip_all => 'strace is not installed or not in PATH';
 }
 
-my $output = "";
-
-$output = `$trunk/bin/pt-ioprofile --help 2>&1`;
+my $output = `$trunk/bin/pt-ioprofile --help 2>&1`;
 like(
    $output,
    qr/--version/,
    "--help"
 );
 
-
 my $t0 = time;
 $output = `$trunk/bin/pt-ioprofile --run-time 3 2>&1`;
 my $t1 = time;
@@ -47,17 +45,16 @@
    "Runs without a file (bug 925778)"
 );
 
-TODO: {
-   local $::TODO = "Timing-related test, may occasionally fail";
-   # If the system is really slow, it may take a second to process the files
-   # and then clean up all the temp stuff. We'll give it a few seconds benefit of the doubt.
-   cmp_ok(
-      int($t1 - $t0),
-      '<=',
-      6,
-      "Runs for --run-time, more or less"
-   );
-}
+# If the system is really slow, it may take a second to process the files
+# and then clean up all the temp stuff. We'll give it a few seconds benefit
+# of the doubt.
+cmp_ok(
+   int($t1 - $t0),
+   '<=',
+   6,
+   "Runs for --run-time, more or less"
+);
+ 
 # #############################################################################
 # Short options.
 # #############################################################################
@@ -72,4 +69,4 @@
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== modified file 't/pt-kill/basics.t'
--- t/pt-kill/basics.t	2012-07-12 22:49:15 +0000
+++ t/pt-kill/basics.t	2012-12-20 23:20:32 +0000
@@ -35,7 +35,7 @@
 
 # Shell out to a sleep(10) query and try to capture the query.
 # Backticks don't work here.
-system("/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(5)' >/dev/null &");
+system("/tmp/12345/use -e 'select sleep(5)' >/dev/null &");
 
 $output = `$cmd --busy-time 1s --print --run-time 10`;
 
@@ -59,7 +59,7 @@
 # --iterations  was 0, and another bug when --run-time was not respected.
 # Do it all over again, this time with --iterations 0.
 # Re issue 1181, --iterations no longer exists, but we'll still keep this test.
-system("/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(10)' >/dev/null&");
+system("/tmp/12345/use -e 'select sleep(10)' >/dev/null&");
 $output = `$cmd --busy-time 1s --print --run-time 11s`;
 @times = $output =~ m/\(Query (\d+) sec\)/g;
 ok(

=== modified file 't/pt-kill/kill.t'
--- t/pt-kill/kill.t	2012-12-04 21:05:32 +0000
+++ t/pt-kill/kill.t	2012-12-20 23:20:32 +0000
@@ -35,7 +35,7 @@
 # TODO:  These tests need something to match, so we background
 # a SLEEP(4) query and match that, but this isn't ideal because
 # it's time-based.  Better is to use a specific db and --match-db.
-my $sys_cmd = "/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(4)' >/dev/null 2>&1 &";
+my $sys_cmd = "/tmp/12345/use -e 'select sleep(4)' >/dev/null 2>&1 &";
 
 # #############################################################################
 # Test that --kill kills the connection.
@@ -83,7 +83,7 @@
 # Here's how this works.  This cmd is going to try 2 queries on the same
 # connection: sleep5 and sleep3.  --kill-query will kill sleep5 causing
 # sleep3 to start using the same connection id (pid).
-system("/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(5); select sleep(3)' >/dev/null&");
+system("/tmp/12345/use -e 'select sleep(5); select sleep(3)' >/dev/null&");
 sleep 0.5;
 $rows = $dbh->selectall_hashref('show processlist', 'id');
 $pid = 0;  # reuse, reset

=== modified file 't/pt-mysql-summary/pt-mysql-summary.t'
--- t/pt-mysql-summary/pt-mysql-summary.t	2012-11-27 22:05:45 +0000
+++ t/pt-mysql-summary/pt-mysql-summary.t	2012-12-20 23:20:32 +0000
@@ -19,13 +19,18 @@
 
 local $ENV{PTDEBUG} = "";
 
+# mysqldump from earlier versions doesn't seem to work with 5.6,
+# so use the actual mysqldump from each MySQL bin which should
+# always be compatible with itself.
+my $env = qq\CMD_MYSQLDUMP="$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqldump"\;
+
 #
 # --save-samples
 #
 
 my $dir = tempdir( "percona-testXXXXXXXX", CLEANUP => 1 );
 
-`$trunk/bin/$tool --sleep 1 --save-samples $dir -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
+`$env $trunk/bin/$tool --sleep 1 --save-samples $dir -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
 
 ok(
    -e $dir,
@@ -41,13 +46,13 @@
    "And leaves all files in there"
 ) or diag($n_files, `ls -l $dir`);
 
-undef($dir);
+undef($dir);  # rm the dir because CLEANUP => 1
 
 #
 # --databases
 #
 
-my $out = `$trunk/bin/$tool --sleep 1 --databases mysql 2>/dev/null -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
+my $out = `$env $trunk/bin/$tool --sleep 1 --databases mysql 2>/dev/null -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
 
 like(
    $out,
@@ -61,8 +66,7 @@
       no_diff(
          sub {
             local $ENV{_NO_FALSE_NEGATIVES} = 1;
-            my $out = `$trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i  -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Skipping schema analysis/'`;
-            print $out;
+            print `$env $trunk/bin/$tool --read-samples $trunk/t/pt-mysql-summary/samples/temp00$i  -- --defaults-file=/tmp/12345/my.sandbox.cnf | tail -n+3 | perl -wlnpe 's/Skipping schema analysis.*/Skipping schema analysis/'`
          },
          "t/pt-mysql-summary/samples/expected_output_temp00$i.txt",
       ),
@@ -82,4 +86,3 @@
 );
 
 done_testing;
-exit;

=== modified file 't/pt-online-schema-change/samples/bug_1045317.sql'
--- t/pt-online-schema-change/samples/bug_1045317.sql	2012-11-06 17:22:56 +0000
+++ t/pt-online-schema-change/samples/bug_1045317.sql	2012-12-20 23:20:32 +0000
@@ -6,5 +6,5 @@
    `val` ENUM('M','E','H') NOT NULL,
    PRIMARY KEY (`id`)
 );
-
 INSERT INTO `bits` VALUES (1, 'M'), (2, 'E'), (3, 'H');
+ANALYZE TABLE bits;

=== modified file 't/pt-query-digest/explain.t'
--- t/pt-query-digest/explain.t	2012-11-21 16:58:40 +0000
+++ t/pt-query-digest/explain.t	2012-12-20 23:20:32 +0000
@@ -23,9 +23,6 @@
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 6;
-}
 
 my $sample = "t/pt-query-digest/samples/";
 
@@ -90,7 +87,6 @@
    'Analysis for slow007 with --explain, failed',
 );
 
-
 # #############################################################################
 # Issue 1196: mk-query-digest --explain is broken
 # #############################################################################
@@ -102,9 +98,9 @@
          '--report-format', 'profile,query_report',
          "$trunk/t/pt-query-digest/samples/issue_1196.log",)
       },
-      ($sandbox_version ge '5.1'
-         ? "t/pt-query-digest/samples/issue_1196-output.txt"
-         : "t/pt-query-digest/samples/issue_1196-output-5.0.txt"),
+      (  $sandbox_version eq '5.6' ? "$sample/issue_1196-output-5.6.txt"
+       : $sandbox_version ge '5.1' ? "$sample/issue_1196-output.txt"
+       :                             "$sample/issue_1196-output-5.0.txt"),
    ),
    "--explain sparkline uses event db and doesn't crash ea (issue 1196"
 );
@@ -114,4 +110,4 @@
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== added file 't/pt-query-digest/samples/issue_1196-output-5.6.txt'
--- t/pt-query-digest/samples/issue_1196-output-5.6.txt	1970-01-01 00:00:00 +0000
+++ t/pt-query-digest/samples/issue_1196-output-5.6.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,62 @@
+
+# Profile
+# Rank Query ID           Response time Calls R/Call Apdx V/M   EXPLAIN Item
+# ==== ================== ============= ===== ====== ==== ===== ======= ========
+#    1 0xD4B6A5CD2F2F485C 0.2148 100.0%     1 0.2148 1.00  0.00 TF>aa   SELECT t
+
+# Query 1: 0 QPS, 0x concurrency, ID 0xD4B6A5CD2F2F485C at byte 0 ________
+# This item is included in the report because it matches --limit.
+# Scores: Apdex = 1.00 [1.0]*, V/M = 0.00
+# EXPLAIN sparkline: TF>aa
+# Query_time sparkline: |     ^  |
+# Time range: all events occurred at 2010-12-14 16:12:28
+# Attribute    pct   total     min     max     avg     95%  stddev  median
+# ============ === ======= ======= ======= ======= ======= ======= =======
+# Count        100       1
+# Exec time    100   215ms   215ms   215ms   215ms   215ms       0   215ms
+# Lock time     99   162us   162us   162us   162us   162us       0   162us
+# Rows sent    100      10      10      10      10      10       0      10
+# Rows examine 100   1.96k   1.96k   1.96k   1.96k   1.96k       0   1.96k
+# Query size   100      82      82      82      82      82       0      82
+# String:
+# Databases    issue_1196
+# Hosts        localhost
+# Users        root
+# Query_time distribution
+#   1us
+#  10us
+# 100us
+#   1ms
+#  10ms
+# 100ms  ################################################################
+#    1s
+#  10s+
+# Tables
+#    SHOW TABLE STATUS FROM `issue_1196` LIKE 't'\G
+#    SHOW CREATE TABLE `issue_1196`.`t`\G
+# EXPLAIN /*!50100 PARTITIONS*/
+select t.a, count(*) from t join t t2 using(a) group by 1 order by 2 desc limit 10\G
+# *************************** 1. row ***************************
+#            id: 1
+#   select_type: SIMPLE
+#         table: t
+#    partitions: NULL
+#          type: ALL
+# possible_keys: NULL
+#           key: NULL
+#       key_len: NULL
+#           ref: NULL
+#          rows: 14
+#         Extra: Using temporary; Using filesort
+# *************************** 2. row ***************************
+#            id: 1
+#   select_type: SIMPLE
+#         table: t2
+#    partitions: NULL
+#          type: ALL
+# possible_keys: NULL
+#           key: NULL
+#       key_len: NULL
+#           ref: NULL
+#          rows: 14
+#         Extra: Using where; Using join buffer (Block Nested Loop)

=== modified file 't/pt-table-checksum/basics.t'
--- t/pt-table-checksum/basics.t	2012-11-21 16:58:40 +0000
+++ t/pt-table-checksum/basics.t	2012-12-20 23:20:32 +0000
@@ -68,9 +68,7 @@
 ok(
    no_diff(
       sub { pt_table_checksum::main(@args) },
-        $sandbox_version gt "5.1 " ? "$sample/default-results-5.5.txt"
-      : $sandbox_version gt "5.0 " ? "$sample/default-results-5.1.txt"
-      :                              "$sample/default-results-5.0.txt",
+      "$sample/default-results-$sandbox_version.txt",
       post_pipe => 'awk \'{print $2 " " $3 " " $4 " " $6 " " $8}\'',
    ),
    "Default checksum"
@@ -93,29 +91,28 @@
 ok(
    no_diff(
       sub { pt_table_checksum::main(@args, qw(--chunk-time 0)) },
-        $sandbox_version gt "5.1" ? "$sample/static-chunk-size-results-5.5.txt"
-      : $sandbox_version gt "5.0" ? "$sample/static-chunk-size-results-5.1.txt"
-      :                             "$sample/static-chunk-size-results-5.0.txt",
+      "$sample/static-chunk-size-results-$sandbox_version.txt",
       post_pipe => 'awk \'{print $2 " " $3 " " $4 " " $5 " " $6 " " $8}\'',
    ),
    "Static chunk size (--chunk-time 0)"
 );
 
+my $n_checksums = $sandbox_version eq "5.6" ? 89
+                : $sandbox_version eq "5.5" ? 90
+                : $sandbox_version eq "5.1" ? 89
+                :                             85;
+
 $row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 is(
    $row->[0],
-   (  $sandbox_version gt "5.1" ? 90
-    : $sandbox_version gt "5.0" ? 89
-    :                             85),
+   $n_checksums,
    'Expected checksums on master'
 );
 
 $row = $slave1_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 is(
    $row->[0],
-   (  $sandbox_version gt "5.1" ? 90
-    : $sandbox_version gt "5.0" ? 89
-    :                             85),
+   $n_checksums,
    'Expected checksums on slave'
 );
 

=== modified file 't/pt-table-checksum/error_handling.t'
--- t/pt-table-checksum/error_handling.t	2012-11-21 16:58:40 +0000
+++ t/pt-table-checksum/error_handling.t	2012-12-20 23:20:32 +0000
@@ -178,8 +178,8 @@
 # Use the --replicate table created by the previous ^ tests.
 
 # Create a user that can't create the --replicate table.
-diag(`/tmp/12345/use -uroot -pmsandbox < $trunk/t/lib/samples/ro-checksum-user.sql`);
-diag(`/tmp/12345/use -uroot -pmsandbox -e "GRANT REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO ro_checksum_user\@'%'"`);
+diag(`/tmp/12345/use -uroot < $trunk/t/lib/samples/ro-checksum-user.sql`);
+diag(`/tmp/12345/use -uroot -e "GRANT REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO ro_checksum_user\@'%'"`);
 
 # Remove the --replicate table from slave1 and slave2,
 # so it's only on the master...
@@ -199,7 +199,7 @@
    "CREATE DATABASE error and db is missing on slaves (bug 1039569)"
 );
 
-diag(`/tmp/12345/use -uroot -pmsandbox -e "DROP USER ro_checksum_user\@'%'"`);
+diag(`/tmp/12345/use -uroot -e "DROP USER ro_checksum_user\@'%'"`);
 
 # #############################################################################
 # Done.

=== modified file 't/pt-table-checksum/issue_388.t'
--- t/pt-table-checksum/issue_388.t	2012-11-21 16:58:40 +0000
+++ t/pt-table-checksum/issue_388.t	2012-12-20 23:20:32 +0000
@@ -45,6 +45,7 @@
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d test)) },
+   stderr => 1,
 );
 
 unlike(

=== modified file 't/pt-table-checksum/run_time.t'
--- t/pt-table-checksum/run_time.t	2012-11-21 16:58:40 +0000
+++ t/pt-table-checksum/run_time.t	2012-12-20 23:20:32 +0000
@@ -44,7 +44,7 @@
 my $t  = time - $t0;
 
 ok(
-   $t >= 1.5 && $t <= 2.5,
+   $t >= 1.1 && $t <= 2.5,
    "Ran in roughly --run-time 1 second"
 ) or diag("Actual run time: $t");
 

=== added file 't/pt-table-checksum/samples/default-results-5.6.txt'
--- t/pt-table-checksum/samples/default-results-5.6.txt	1970-01-01 00:00:00 +0000
+++ t/pt-table-checksum/samples/default-results-5.6.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,41 @@
+ERRORS DIFFS ROWS SKIPPED TABLE
+0 0 0 0 mysql.columns_priv
+0 0 2 0 mysql.db
+0 0 0 0 mysql.event
+0 0 0 0 mysql.func
+0 0 39 0 mysql.help_category
+0 0 461 0 mysql.help_keyword
+0 0 1045 0 mysql.help_relation
+0 0 324 0 mysql.help_topic
+0 0 0 0 mysql.ndb_binlog_index
+0 0 0 0 mysql.plugin
+0 0 0 0 mysql.proc
+0 0 0 0 mysql.procs_priv
+0 0 2 0 mysql.proxies_priv
+0 0 0 0 mysql.servers
+0 0 0 0 mysql.tables_priv
+0 0 0 0 mysql.time_zone
+0 0 0 0 mysql.time_zone_leap_second
+0 0 0 0 mysql.time_zone_name
+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 42 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
+0 0 603 0 sakila.address
+0 0 16 0 sakila.category
+0 0 600 0 sakila.city
+0 0 109 0 sakila.country
+0 0 599 0 sakila.customer
+0 0 1000 0 sakila.film
+0 0 5462 0 sakila.film_actor
+0 0 1000 0 sakila.film_category
+0 0 1000 0 sakila.film_text
+0 0 4581 0 sakila.inventory
+0 0 6 0 sakila.language
+0 0 16049 0 sakila.payment
+0 0 16044 0 sakila.rental
+0 0 2 0 sakila.staff
+0 0 2 0 sakila.store

=== added file 't/pt-table-checksum/samples/repl-table-myisam.sql'
--- t/pt-table-checksum/samples/repl-table-myisam.sql	1970-01-01 00:00:00 +0000
+++ t/pt-table-checksum/samples/repl-table-myisam.sql	2012-12-20 23:20:32 +0000
@@ -0,0 +1,19 @@
+DROP DATABASE IF EXISTS percona;
+CREATE DATABASE percona;
+USE percona;
+CREATE TABLE checksums (
+  db             char(64)     NOT NULL,
+  tbl            char(64)     NOT NULL,
+  chunk          int          NOT NULL,
+  chunk_time     float            NULL,
+  chunk_index    varchar(200)     NULL,
+  lower_boundary text             NULL,
+  upper_boundary text             NULL,
+  this_crc       char(40)     NOT NULL,
+  this_cnt       int          NOT NULL,
+  master_crc     char(40)         NULL,
+  master_cnt     int              NULL,
+  ts             timestamp    NOT NULL,
+  PRIMARY KEY (db, tbl, chunk),
+  INDEX ts_db_tbl (ts, db, tbl)
+) ENGINE=MyISAM;

=== added 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	1970-01-01 00:00:00 +0000
+++ t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt	2012-12-20 23:20:32 +0000
@@ -0,0 +1,41 @@
+ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
+0 0 0 1 0 mysql.columns_priv
+0 0 2 1 0 mysql.db
+0 0 0 1 0 mysql.event
+0 0 0 1 0 mysql.func
+0 0 39 1 0 mysql.help_category
+0 0 461 1 0 mysql.help_keyword
+0 0 1045 1 0 mysql.help_relation
+0 0 324 1 0 mysql.help_topic
+0 0 0 1 0 mysql.ndb_binlog_index
+0 0 0 1 0 mysql.plugin
+0 0 0 1 0 mysql.proc
+0 0 0 1 0 mysql.procs_priv
+0 0 2 1 0 mysql.proxies_priv
+0 0 0 1 0 mysql.servers
+0 0 0 1 0 mysql.tables_priv
+0 0 0 1 0 mysql.time_zone
+0 0 0 1 0 mysql.time_zone_leap_second
+0 0 0 1 0 mysql.time_zone_name
+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 42 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
+0 0 603 1 0 sakila.address
+0 0 16 1 0 sakila.category
+0 0 600 1 0 sakila.city
+0 0 109 1 0 sakila.country
+0 0 599 1 0 sakila.customer
+0 0 1000 1 0 sakila.film
+0 0 5462 8 0 sakila.film_actor
+0 0 1000 1 0 sakila.film_category
+0 0 1000 1 0 sakila.film_text
+0 0 4581 7 0 sakila.inventory
+0 0 6 1 0 sakila.language
+0 0 16049 19 0 sakila.payment
+0 0 16044 19 0 sakila.rental
+0 0 2 1 0 sakila.staff
+0 0 2 1 0 sakila.store

=== modified file 't/pt-table-checksum/skip_innodb.t'
--- t/pt-table-checksum/skip_innodb.t	2012-11-21 16:58:40 +0000
+++ t/pt-table-checksum/skip_innodb.t	2012-12-20 23:20:32 +0000
@@ -15,11 +15,12 @@
 use Sandbox;
 require "$trunk/bin/pt-table-checksum";
 
-diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349");
-diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+if ( $sandbox_version eq '5.6' ) {
+   plan skip_all => 'http://bugs.mysql.com/67798';
+}
+
+diag(`$trunk/sandbox/stop-sandbox 12348 12349 >/dev/null`);
 diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
-
-diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
 diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox slave 12349 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
@@ -33,9 +34,6 @@
 elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave 12349';
 }
-else {
-   plan tests => 3;
-}
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
 # so we need to specify --lock-wait-timeout=3 else the tool will die.
@@ -45,6 +43,26 @@
 my $output;
 my $retval;
 
+if ( $sandbox_version ge '5.6' ) {
+   # Before MySQL 5.6, even with the InnoDB engine off, creating an InnoDB
+   # table would simply result in:
+   #
+   # mysql> create table t (i int) engine=innodb;
+   # Query OK, 0 rows affected, 2 warnings (0.01 sec)
+   #
+   # mysql> show warnings;
+   # +---------+------+-------------------------------------------+
+   # | Level   | Code | Message                                   |
+   # +---------+------+-------------------------------------------+
+   # | Warning | 1286 | Unknown table engine 'innodb'             |
+   # | Warning | 1266 | Using storage engine MyISAM for table 't' |
+   # +---------+------+-------------------------------------------+
+   #
+   # But 5.6 throws an error.  So we have to create the table manually.
+   $sb->load_file('master1', "t/pt-table-checksum/samples/repl-table-myisam.sql");
+   $sb->wait_for_slaves(master => 'master1', slave => 'master2');
+}
+
 $output = output(
    sub { $retval = pt_table_checksum::main(@args) },
    stderr => 1,
@@ -60,13 +78,12 @@
    $retval,
    0,
    "0 exit status (bug 996110)"
-);
+) or diag($output);
 
 # #############################################################################
 # Done.
 # #############################################################################
-diag('Shutting down sandboxes');
-diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
-diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+$sb->wipe_clean($master_dbh);
+diag(`$trunk/sandbox/stop-sandbox 12349 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== modified file 't/pt-table-sync/basics.t'
--- t/pt-table-sync/basics.t	2012-06-07 14:25:44 +0000
+++ t/pt-table-sync/basics.t	2012-12-20 23:20:32 +0000
@@ -188,7 +188,7 @@
 
 like(
    $output,
-   qr/^REPLACE INTO `sakila`.`actor`\(`actor_id`, `first_name`, `last_name`, `last_update`\) VALUES \('30', 'SANDRA', 'PECK', '2006-02-15 04:34:33'\)/,
+   qr/^REPLACE INTO `sakila`.`actor`\(`actor_id`, `first_name`, `last_name`, `last_update`\) VALUES \('30', 'SANDRA', 'PECK', '2006-02-15 11:34:33'\)/,
    "--replicate with char index col (bug 911996)"
 );
 

=== modified file 't/pt-upgrade/warnings.t'
--- t/pt-upgrade/warnings.t	2012-10-17 22:19:44 +0000
+++ t/pt-upgrade/warnings.t	2012-12-20 23:20:32 +0000
@@ -15,38 +15,36 @@
 use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
-# This runs immediately if the server is already running, else it starts it.
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/stop-sandbox master 12349 >/dev/null`);
+diag(`QUERY_CACHE_SIZE=1048576 $trunk/sandbox/start-sandbox master 12349 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('master1');
+my $dbh2 = $sb->get_dbh_for('master2');
 
 if ( !$dbh1 ) {
-   diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
    plan skip_all => 'Cannot connect to sandbox master';
 }
 elsif ( !$dbh2 ) {
-   diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
+   diag(`$trunk/sandbox/stop-sandbox master 12349 >/dev/null`);
    plan skip_all => 'Cannot connect to second sandbox master';
 }
 
 $sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');
-$sb->load_file('master1', 't/pt-upgrade/samples/001/tables.sql');
+$sb->load_file('master2', 't/pt-upgrade/samples/001/tables.sql');
 
 my $output;
-my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox,L=1 P=12348 --compare results,warnings --zero-query-times --compare-results-method rows --limit 10";
+my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox,L=1 P=12349 --compare results,warnings --zero-query-times --compare-results-method rows --limit 10";
 
 # This test really deals with,
 #   http://code.google.com/p/maatkit/issues/detail?id=754
 #   http://bugs.mysql.com/bug.php?id=49634
 
-$dbh2->do('set global query_cache_size=1000000');
-
 my $qc = $dbh2->selectrow_arrayref("show variables like 'query_cache_size'")->[1];
-ok(
-   $qc > 999000,
+is(
+   $qc,
+   1048576,
    'Query size'
 );
 
@@ -62,7 +60,7 @@
 $output = `$cmd $trunk/t/pt-upgrade/samples/001/one-error.log`;
 like(
    $output,
-   qr/# 3B323396273BC4C7-1 127.1:12348 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
+   qr/# 3B323396273BC4C7-1 127.1:12349 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
    '--clear-warnings',
 );
 
@@ -78,22 +76,15 @@
 $output = `$cmd --no-clear-warnings $trunk/t/pt-upgrade/samples/001/one-error.log`;
 like(
    $output,
-   qr/# 3B323396273BC4C7-1 127.1:12348 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
+   qr/# 3B323396273BC4C7-1 127.1:12349 Failed to execute query.+Unknown column 'borked' in 'field list' \[for Statement "select borked"\] at .+?\n\n/,
    '--no-clear-warnings'
 );
 
-$dbh2->do('set global query_cache_size=0');
-$qc = $dbh2->selectrow_arrayref("show variables like 'query_cache_size'")->[1];
-ok(
-   $qc == 0,
-   'Query size'
-);
-
 # #############################################################################
 # Done.
 # #############################################################################
+diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
 $sb->wipe_clean($dbh1);
-diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
 exit;