Merge 2.1 at r519 (release-2.1.8).

2025-09-25 21:54:48 +00:00 · 2013-01-09 08:44:25 -07:00
parent 083f60bd6f c1f284d648
commit a7ed751315
134 changed files with 485 additions and 249 deletions
--- a/36
+++ b/36
@@ -1,5 +1,41 @@
 Changelog for Percona Toolkit

+v2.1.8 released 2012-12-21
+
+  * Beta support for MySQL 5.6
+  * Beta support for Percona XtraDB Cluster
+  * pt-online-schema-change: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+  * pt-table-checksum: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+  * pt-upgrade: Added --[no]disable-query-cache
+  * Fixed bug  927955: Bad pod2rst transformation
+  * Fixed bug  898665: Bad online docs formatting for --[no]vars
+  * Fixed bug 1022622: pt-config-diff is case-sensitive
+  * Fixed bug 1007938: pt-config-diff doesn't handle end-of-line comments
+  * Fixed bug  917770: pt-config-diff Use of uninitialized value in substitution (s///) at line 1996
+  * Fixed bug 1082104: pt-deadlock-logger doesn't handle usernames with dashes
+  * Fixed bug  886059: pt-heartbeat handles timezones inconsistently
+  * Fixed bug 1086259: pt-kill --log-dsn timestamp is wrong
+  * Fixed bug 1015590: pt-mysql-summary doesn't handle renamed variables in Percona Server 5.5
+  * Fixed bug 1079341: pt-online-schema-change checks for foreign keys on MyISAM tables
+  * Fixed bug  823431: pt-query-advisor hangs on big queries
+  * Fixed bug  996069: pt-query-advisor RES.001 is incorrect
+  * Fixed bug  933465: pt-query-advisor false positive on RES.001
+  * Fixed bug  937234: pt-query-advisor issues wrong RES.001
+  * Fixed bug 1082599: pt-query-digest fails to parse timestamp with no query
+  * Fixed bug 1078838: pt-query-digest doesn't parse general log with "Connect user as user"
+  * Fixed bug  957442: pt-query-digest with custom --group-by throws error
+  * Fixed bug  887638: pt-query-digest prints negative byte offset
+  * Fixed bug  831525: pt-query-digest help output mangled
+  * Fixed bug  932614: pt-slave-restart CHANGE MASTER query causes error
+  * Fixed bug 1046440: pt-stalk purge_samples slows down checks
+  * Fixed bug  986847: pt-stalk does not report NFS iostat
+  * Fixed bug 1074179: pt-table-checksum doesn't ignore tables for --replicate-check-only
+  * Fixed bug  911385: pt-table-checksum v2 fails when --resume + --ignore-database is used
+  * Fixed bug 1041391: pt-table-checksum debug statement for "Chosen hash func" prints undef
+  * Fixed bug 1075638: pt-table-checksum Illegal division by zero at line 7950
+  * Fixed bug 1052475: pt-table-checksum uninitialized value in numeric lt (<) at line 8611
+  * Fixed bug 1078887: Tools let --set-vars clobber the required SQL mode
+
 v2.1.7 released 2012-11-19

  * Fixed bug 1080384: pt-table-checksum 2.1.6 crashes using PTDEBUG
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;

 WriteMakefile(
    NAME      => 'percona-toolkit',
-    VERSION   => '2.1.7',
+    VERSION   => '2.1.8',
    EXE_FILES => [ <bin/*> ],
    MAN1PODS  => {
      'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -199,8 +199,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -218,6 +218,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-align 2.1.7
+pt-align 2.1.8

 =cut
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -39,7 +39,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -7555,8 +7555,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -7574,6 +7574,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-archiver 2.1.7
+pt-archiver 2.1.8

 =cut
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -38,7 +38,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -4853,8 +4853,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4872,6 +4871,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-config-diff 2.1.7
+pt-config-diff 2.1.8

 =cut
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -36,7 +36,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -4766,8 +4766,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4785,6 +4785,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-deadlock-logger 2.1.7
+pt-deadlock-logger 2.1.8

 =cut
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -38,7 +38,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -1240,6 +1240,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -5548,8 +5551,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -5567,6 +5570,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-diskstats 2.1.7
+pt-diskstats 2.1.8

 =cut
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -39,7 +39,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -5416,8 +5416,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -5435,6 +5435,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-duplicate-key-checker 2.1.7
+pt-duplicate-key-checker 2.1.8

 =cut
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -1549,8 +1549,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -1568,6 +1568,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fifo-split 2.1.7
+pt-fifo-split 2.1.8

 =cut
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -35,7 +35,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -4879,8 +4879,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4898,6 +4898,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-find 2.1.7
+pt-find 2.1.8

 =cut
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -2129,8 +2129,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2012 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -2148,6 +2147,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fingerprint 2.1.7
+pt-fingerprint 2.1.8

 =cut
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -35,7 +35,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -4011,8 +4011,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2012 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4030,6 +4029,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fk-error-logger 2.1.7
+pt-fk-error-logger 2.1.8

 =cut
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -38,7 +38,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -3168,6 +3168,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -6023,9 +6026,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2006 Proven Scaling LLC and Six Apart Ltd,
-2007-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2007-2013 Percona Ireland Ltd,
+2006 Proven Scaling LLC and Six Apart Ltd.

 Feedback and improvements are welcome.

@@ -6045,6 +6047,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-heartbeat 2.1.7
+pt-heartbeat 2.1.8

 =cut
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -45,7 +45,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -2713,14 +2713,25 @@ sub parse_event {

            if ( !$found_arg && $pos == $len ) {
               PTDEBUG && _d("Did not find arg, looking for special cases");
-               local $INPUT_RECORD_SEPARATOR = ";\n";
+               local $INPUT_RECORD_SEPARATOR = ";\n";  # get next line
               if ( defined(my $l = $next_event->()) ) {
-                  chomp $l;
-                  $l =~ s/^\s+//;
-                  PTDEBUG && _d("Found admin statement", $l);
-                  push @properties, 'cmd', 'Admin', 'arg', $l;
-                  push @properties, 'bytes', length($properties[-1]);
-                  $found_arg++;
+                  if ( $l =~ /^\s*[A-Z][a-z_]+: / ) {
+                     PTDEBUG && _d("Found NULL query before", $l);
+                     local $INPUT_RECORD_SEPARATOR = ";\n#";
+                     my $rest_of_event = $next_event->();
+                     push @{$self->{pending}}, $l . $rest_of_event;
+                     push @properties, 'cmd', 'Query', 'arg', '/* No query */';
+                     push @properties, 'bytes', 0;
+                     $found_arg++;
+                  }
+                  else {
+                     chomp $l;
+                     $l =~ s/^\s+//;
+                     PTDEBUG && _d("Found admin statement", $l);
+                     push @properties, 'cmd', 'Admin', 'arg', $l;
+                     push @properties, 'bytes', length($properties[-1]);
+                     $found_arg++;
+                  }
               }
               else {
                  PTDEBUG && _d("I can't figure out what to do with this line");
@@ -3349,6 +3360,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -7450,8 +7464,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -7469,6 +7483,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-index-usage 2.1.7
+pt-index-usage 2.1.8

 =cut
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -69,7 +69,7 @@ PO_DIR=""         # Directory with program option spec files
 usage() {
   local file="$1"

-   local usage=$(grep '^Usage: ' "$file")
+   local usage="$(grep '^Usage: ' "$file")"
   echo $usage
   echo
   echo "For more information, 'man $TOOL' or 'perldoc $file'."
@@ -1084,8 +1084,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -1103,7 +1103,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-ioprofile 2.1.7
+pt-ioprofile 2.1.8

 =cut

--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -43,7 +43,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -2275,6 +2275,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -7767,8 +7770,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2009-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2009-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -7786,6 +7789,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-kill 2.1.7
+pt-kill 2.1.8

 =cut
--- a/bin/pt-mext
+++ b/bin/pt-mext
@@ -263,8 +263,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -282,7 +282,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mext 2.1.7
+pt-mext 2.1.8

 =cut

--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -2983,8 +2983,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -3002,7 +3002,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mysql-summary 2.1.7
+pt-mysql-summary 2.1.8

 =cut

--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -51,7 +51,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -5835,6 +5835,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -10830,8 +10833,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -10849,6 +10851,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-online-schema-change 2.1.7
+pt-online-schema-change 2.1.8

 =cut
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -377,8 +377,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -396,7 +396,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-pmp 2.1.7
+pt-pmp 2.1.8

 =cut

--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -46,7 +46,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -1727,14 +1727,25 @@ sub parse_event {

            if ( !$found_arg && $pos == $len ) {
               PTDEBUG && _d("Did not find arg, looking for special cases");
-               local $INPUT_RECORD_SEPARATOR = ";\n";
+               local $INPUT_RECORD_SEPARATOR = ";\n";  # get next line
               if ( defined(my $l = $next_event->()) ) {
-                  chomp $l;
-                  $l =~ s/^\s+//;
-                  PTDEBUG && _d("Found admin statement", $l);
-                  push @properties, 'cmd', 'Admin', 'arg', $l;
-                  push @properties, 'bytes', length($properties[-1]);
-                  $found_arg++;
+                  if ( $l =~ /^\s*[A-Z][a-z_]+: / ) {
+                     PTDEBUG && _d("Found NULL query before", $l);
+                     local $INPUT_RECORD_SEPARATOR = ";\n#";
+                     my $rest_of_event = $next_event->();
+                     push @{$self->{pending}}, $l . $rest_of_event;
+                     push @properties, 'cmd', 'Query', 'arg', '/* No query */';
+                     push @properties, 'bytes', 0;
+                     $found_arg++;
+                  }
+                  else {
+                     chomp $l;
+                     $l =~ s/^\s+//;
+                     PTDEBUG && _d("Found admin statement", $l);
+                     push @properties, 'cmd', 'Admin', 'arg', $l;
+                     push @properties, 'bytes', length($properties[-1]);
+                     $found_arg++;
+                  }
               }
               else {
                  PTDEBUG && _d("I can't figure out what to do with this line");
@@ -1890,7 +1901,8 @@ sub parse_event {
               $cmd = $arg;
            }
            else {
-               my ($user, undef, $db) = $arg =~ /(\S+)/g;
+               my ($user) = $arg =~ m/(\S+)/;
+               my ($db)   = $arg =~ m/on (\S+)/;
               my $host;
               ($user, $host) = split(/@/, $user);
               PTDEBUG && _d('Connect', $user, '@', $host, 'on', $db);
@@ -2907,6 +2919,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -8694,8 +8709,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2010-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -8713,6 +8727,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-query-advisor 2.1.7
+pt-query-advisor 2.1.8

 =cut
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -64,7 +64,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -1769,6 +1769,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -17405,8 +17408,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2008-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2008-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -17424,6 +17426,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-query-digest 2.1.7
+pt-query-digest 2.1.8

 =cut
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2285,8 +2285,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -2304,6 +2304,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-show-grants 2.1.7
+pt-show-grants 2.1.8

 =cut
--- a/bin/pt-sift
+++ b/bin/pt-sift
@@ -762,8 +762,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -781,7 +781,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-sift 2.1.7
+pt-sift 2.1.8

 =cut

--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -36,7 +36,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -2268,6 +2268,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -4578,9 +4581,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Sergey Zhuravle and Baron Schwartz,
-2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Sergey Zhuravle and Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4598,6 +4600,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-delay 2.1.7
+pt-slave-delay 2.1.8

 =cut
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -3175,6 +3175,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -4003,8 +4006,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -4022,6 +4025,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-find 2.1.7
+pt-slave-find 2.1.8

 =cut
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -37,7 +37,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -5500,8 +5500,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -5519,6 +5519,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-restart 2.1.7
+pt-slave-restart 2.1.8

 =cut
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -71,7 +71,7 @@ PO_DIR=""         # Directory with program option spec files
 usage() {
   local file="$1"

-   local usage=$(grep '^Usage: ' "$file")
+   local usage="$(grep '^Usage: ' "$file")"
   echo $usage
   echo
   echo "For more information, 'man $TOOL' or 'perldoc $file'."
@@ -1965,8 +1965,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -1984,7 +1984,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-stalk 2.1.7
+pt-stalk 2.1.8

 =cut

--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -78,7 +78,7 @@ PO_DIR=""         # Directory with program option spec files
 usage() {
   local file="$1"

-   local usage=$(grep '^Usage: ' "$file")
+   local usage="$(grep '^Usage: ' "$file")"
   echo $usage
   echo
   echo "For more information, 'man $TOOL' or 'perldoc $file'."
@@ -2654,8 +2654,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2010-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -2673,7 +2673,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-summary 2.1.7
+pt-summary 2.1.8

 =cut

--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -53,7 +53,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -7360,6 +7360,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -11951,8 +11954,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -11970,6 +11973,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-checksum 2.1.7
+pt-table-checksum 2.1.8

 =cut
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -52,7 +52,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -8036,6 +8036,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -12614,8 +12617,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -12633,6 +12636,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-sync 2.1.7
+pt-table-sync 2.1.8

 =cut
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -7365,8 +7365,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2012-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -7384,6 +7383,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-usage 2.1.7
+pt-table-usage 2.1.8

 =cut
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -58,7 +58,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -2174,6 +2174,9 @@ sub parse_timestamp {
                     . (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;
 }

@@ -2498,14 +2501,25 @@ sub parse_event {

            if ( !$found_arg && $pos == $len ) {
               PTDEBUG && _d("Did not find arg, looking for special cases");
-               local $INPUT_RECORD_SEPARATOR = ";\n";
+               local $INPUT_RECORD_SEPARATOR = ";\n";  # get next line
               if ( defined(my $l = $next_event->()) ) {
-                  chomp $l;
-                  $l =~ s/^\s+//;
-                  PTDEBUG && _d("Found admin statement", $l);
-                  push @properties, 'cmd', 'Admin', 'arg', $l;
-                  push @properties, 'bytes', length($properties[-1]);
-                  $found_arg++;
+                  if ( $l =~ /^\s*[A-Z][a-z_]+: / ) {
+                     PTDEBUG && _d("Found NULL query before", $l);
+                     local $INPUT_RECORD_SEPARATOR = ";\n#";
+                     my $rest_of_event = $next_event->();
+                     push @{$self->{pending}}, $l . $rest_of_event;
+                     push @properties, 'cmd', 'Query', 'arg', '/* No query */';
+                     push @properties, 'bytes', 0;
+                     $found_arg++;
+                  }
+                  else {
+                     chomp $l;
+                     $l =~ s/^\s+//;
+                     PTDEBUG && _d("Found admin statement", $l);
+                     push @properties, 'cmd', 'Admin', 'arg', $l;
+                     push @properties, 'bytes', length($properties[-1]);
+                     $found_arg++;
+                  }
               }
               else {
                  PTDEBUG && _d("I can't figure out what to do with this line");
@@ -13139,8 +13153,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2009-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2009-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -13158,6 +13171,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-upgrade 2.1.7
+pt-upgrade 2.1.8

 =cut
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -40,7 +40,7 @@ BEGIN {
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
@@ -5851,8 +5851,7 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2010-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2010-2013 Percona Ireland Ltd.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -5870,6 +5869,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-variable-advisor 2.1.7
+pt-variable-advisor 2.1.8

 =cut
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -3124,8 +3124,8 @@ L<http://www.percona.com/software/> for more software developed by Percona.

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
-Feedback and improvements are welcome.
+This program is copyright 2011-2013 Percona Ireland Ltd,
+2007-2011 Baron Schwartz.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
@@ -3143,6 +3143,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-visual-explain 2.1.7
+pt-visual-explain 2.1.8

 =cut
--- a/config/deb/changelog
+++ b/config/deb/changelog
@@ -1,3 +1,41 @@
+percona-toolkit (2.1.8) unstable; urgency=low
+
+  * Beta support for MySQL 5.6
+  * Beta support for Percona XtraDB Cluster
+  * pt-online-schema-change: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+  * pt-table-checksum: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+  * pt-upgrade: Added --[no]disable-query-cache
+  * Fixed bug  927955: Bad pod2rst transformation
+  * Fixed bug  898665: Bad online docs formatting for --[no]vars
+  * Fixed bug 1022622: pt-config-diff is case-sensitive
+  * Fixed bug 1007938: pt-config-diff doesn't handle end-of-line comments
+  * Fixed bug  917770: pt-config-diff Use of uninitialized value in substitution (s///) at line 1996
+  * Fixed bug 1082104: pt-deadlock-logger doesn't handle usernames with dashes
+  * Fixed bug  886059: pt-heartbeat handles timezones inconsistently
+  * Fixed bug 1086259: pt-kill --log-dsn timestamp is wrong
+  * Fixed bug 1015590: pt-mysql-summary doesn't handle renamed variables in Percona Server 5.5
+  * Fixed bug 1079341: pt-online-schema-change checks for foreign keys on MyISAM tables
+  * Fixed bug  823431: pt-query-advisor hangs on big queries
+  * Fixed bug  996069: pt-query-advisor RES.001 is incorrect
+  * Fixed bug  933465: pt-query-advisor false positive on RES.001
+  * Fixed bug  937234: pt-query-advisor issues wrong RES.001
+  * Fixed bug 1082599: pt-query-digest fails to parse timestamp with no query
+  * Fixed bug 1078838: pt-query-digest doesn't parse general log with "Connect user as user"
+  * Fixed bug  957442: pt-query-digest with custom --group-by throws error
+  * Fixed bug  887638: pt-query-digest prints negative byte offset
+  * Fixed bug  831525: pt-query-digest help output mangled
+  * Fixed bug  932614: pt-slave-restart CHANGE MASTER query causes error
+  * Fixed bug 1046440: pt-stalk purge_samples slows down checks
+  * Fixed bug  986847: pt-stalk does not report NFS iostat
+  * Fixed bug 1074179: pt-table-checksum doesn't ignore tables for --replicate-check-only
+  * Fixed bug  911385: pt-table-checksum v2 fails when --resume + --ignore-database is used
+  * Fixed bug 1041391: pt-table-checksum debug statement for "Chosen hash func" prints undef
+  * Fixed bug 1075638: pt-table-checksum Illegal division by zero at line 7950
+  * Fixed bug 1052475: pt-table-checksum uninitialized value in numeric lt (<) at line 8611
+  * Fixed bug 1078887: Tools let --set-vars clobber the required SQL mode
+
+ -- Percona Toolkit Developers <toolkit-dev@percona.com>  Fri, 21 Dec 2012 17:31:09 +0000
+
 percona-toolkit (2.1.7) unstable; urgency=low

  * Fixed bug 1080384: pt-table-checksum 2.1.6 crashes using PTDEBUG
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -50,7 +50,7 @@ copyright = u'2011, Percona Inc'
 # The short X.Y version.
 version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.7'
+release = '2.1.8'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -17,7 +17,7 @@ no libraries are installed.

 Percona Toolkit is derived from Maatkit and Aspersa, two of the best-known
 toolkits for MySQL server administration.  It is developed and supported by
-Percona Inc.  For more information and other free, open-source software
+Percona.  For more information and other free, open-source software
 developed by Percona, visit L<http://www.percona.com/software/>.

 =head1 TOOLS
@@ -485,13 +485,33 @@ see L<"ENVIRONMENT">.

 =head1 AUTHORS

-Percona Toolkit is primarily developed by Baron Schwartz and Daniel Nichter,
-both of whom are employed by Percona Inc.  See each program's documentation
-for details.
+=over
+
+=item Baron Schwartz
+
+Baron created Maatkit, from which Percona Toolkit was forked.  Many of
+the tools and modules were originally written by Baron.
+
+=item Daniel Nichter
+
+Daniel began helping Baron with Maatkit and, later, Percona Toolkit in
+June, 2008.  He is the project's lead developer, employed by Percona.
+
+=item Brian Fraser
+
+Brian started with Percona in December, 2011.  He works on Percona Toolkit
+full-time, employed by Percona.
+
+=item Others
+
+Many people have contributed code over the years.  See each tool's
+"AUTHORS" section for details.
+
+=back

 =head1 COPYRIGHT, LICENSE, AND WARRANTY

-Percona Toolkit is copyright 2011-2012 Percona Inc. and others.
+Percona Toolkit is copyright 2011-2013 Percona Ireland Ltd and others.
 See each program's documentation for complete copyright notices.

 THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -510,6 +530,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-Percona Toolkit v2.1.7 released 2012-11-19
+Percona Toolkit v2.1.8 released 2012-12-21

 =cut
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,6 +1,89 @@
 Release Notes
 *************

+v2.1.8 released 2012-12-21
+==========================
+
+Percona Toolkit 2.1.8 has been released.  This release includes 28 bug fixes, beta support for MySQL 5.6, and extensive support for Percona XtraDB Cluster (PXC).  Users intending on running the tools on Percona XtraDB Cluster or MySQL 5.6 should upgrade.  The following tools have been verified to work on PXC versions 5.5.28 and newer:
+
+* pt-table-chcecksum
+* pt-online-schema-change
+* pt-archive
+* pt-mysql-summary
+* pt-heartbeat
+* pt-variable-advisor
+* pt-config-diff
+* pt-deadlock-logger
+
+However, there are limitations when running these tools on PXC; see the Percona XtraDB Cluster section in each tool's documentation for further details.  All other tools, with the exception of pt-slave-find, pt-slave-delay and pt-slave-restart, should also work correctly, but in some cases they have not been modified to take advantage of PXC features, so they may behave differently in future releases.
+
+The bug fixes are widely assorted.  The following highlights some of the more interesting and "hot" bugs:
+
+* Fixed bug 1082599: pt-query-digest fails to parse timestamp with no query
+
+Slow logs which include timestamps but no query--which can happen if using slow_query_log_timestamp_always in Percona Server--were misparsed, resulting in an erroneous report.  Now such no-query events show up in reports as ``/* No query */``.
+
+* Fixed bug 1078838: pt-query-digest doesn't parse general log with "Connect user as user"
+
+The "as" was misparsed and the following word would end up reported as the database; pt-query-digest now handles this correctly.
+
+* Fixed bug 1015590: pt-mysql-summary doesn't handle renamed variables in Percona Server 5.5
+
+Some renamed variables had caused the Percona Server section to work unreliably.
+
+* Fixed bug 1074179:  pt-table-checksum doesn't ignore tables for --replicate-check-only
+
+When using --replicate-check-only, filter options like --databases and --tables were not applied.
+
+* Fixed bug 886059: pt-heartbeat handles timezones inconsistently
+
+Previously, pt-heartbeat respected the MySQL time zone, but this caused false readings (e.g. very high lag) with slaves running in different time zones.  Now pt-heartbeat uses UTC regardless of the server or MySQL time zone.
+
+* Fixed bug 1079341: pt-online-schema-change checks for foreign keys on MyISAM tables
+
+Since MyISAM tables can't have foreign keys, and the tool uses the information_schema to find child tables, this could cause unnecessary load on the server.
+
+2.1.8 continues the trend of solid bug fix releases, and all 2.1 users are encouraged to upgrade.
+
+Percona Toolkit packages can be downloaded from http://www.percona.com/downloads/percona-toolkit/ or the Percona Software Repositories (http://www.percona.com/software/repositories/).
+
+Changelog
+---------
+
+* Beta support for MySQL 5.6
+* Beta support for Percona XtraDB Cluster
+* pt-online-schema-change: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+* pt-table-checksum: If ran on Percona XtraDB Cluster, requires PXC 5.5.28 or newer
+* pt-upgrade: Added --[no]disable-query-cache
+* Fixed bug  927955: Bad pod2rst transformation
+* Fixed bug  898665: Bad online docs formatting for --[no]vars
+* Fixed bug 1022622: pt-config-diff is case-sensitive
+* Fixed bug 1007938: pt-config-diff doesn't handle end-of-line comments
+* Fixed bug  917770: pt-config-diff Use of uninitialized value in substitution (s///) at line 1996
+* Fixed bug 1082104: pt-deadlock-logger doesn't handle usernames with dashes
+* Fixed bug  886059: pt-heartbeat handles timezones inconsistently
+* Fixed bug 1086259: pt-kill --log-dsn timestamp is wrong
+* Fixed bug 1015590: pt-mysql-summary doesn't handle renamed variables in Percona Server 5.5
+* Fixed bug 1079341: pt-online-schema-change checks for foreign keys on MyISAM tables
+* Fixed bug  823431: pt-query-advisor hangs on big queries
+* Fixed bug  996069: pt-query-advisor RES.001 is incorrect
+* Fixed bug  933465: pt-query-advisor false positive on RES.001
+* Fixed bug  937234: pt-query-advisor issues wrong RES.001
+* Fixed bug 1082599: pt-query-digest fails to parse timestamp with no query
+* Fixed bug 1078838: pt-query-digest doesn't parse general log with "Connect user as user"
+* Fixed bug  957442: pt-query-digest with custom --group-by throws error
+* Fixed bug  887638: pt-query-digest prints negative byte offset
+* Fixed bug  831525: pt-query-digest help output mangled
+* Fixed bug  932614: pt-slave-restart CHANGE MASTER query causes error
+* Fixed bug 1046440: pt-stalk purge_samples slows down checks
+* Fixed bug  986847: pt-stalk does not report NFS iostat
+* Fixed bug 1074179: pt-table-checksum doesn't ignore tables for --replicate-check-only
+* Fixed bug  911385: pt-table-checksum v2 fails when --resume + --ignore-database is used
+* Fixed bug 1041391: pt-table-checksum debug statement for "Chosen hash func" prints undef
+* Fixed bug 1075638: pt-table-checksum Illegal division by zero at line 7950
+* Fixed bug 1052475: pt-table-checksum uninitialized value in numeric lt (<) at line 8611
+* Fixed bug 1078887: Tools let --set-vars clobber the required SQL mode
+
 v2.1.7 released 2012-11-19
 ==========================

--- a/lib/Advisor.pm
+++ b/lib/Advisor.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/AdvisorRules.pm
+++ b/lib/AdvisorRules.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/BinaryLogParser.pm
+++ b/lib/BinaryLogParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/ChangeHandler.pm
+++ b/lib/ChangeHandler.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/CleanupTask.pm
+++ b/lib/CleanupTask.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/CompareQueryTimes.pm
+++ b/lib/CompareQueryTimes.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/CompareResults.pm
+++ b/lib/CompareResults.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/CompareWarnings.pm
+++ b/lib/CompareWarnings.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/CopyRowsInsertSelect.pm
+++ b/lib/CopyRowsInsertSelect.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Cxn.pm
+++ b/lib/Cxn.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DSNParser.pm
+++ b/lib/DSNParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Daemon.pm
+++ b/lib/Daemon.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Diskstats.pm
+++ b/lib/Diskstats.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DiskstatsGroupByAll.pm
+++ b/lib/DiskstatsGroupByAll.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DiskstatsGroupByDisk.pm
+++ b/lib/DiskstatsGroupByDisk.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DiskstatsGroupBySample.pm
+++ b/lib/DiskstatsGroupBySample.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DiskstatsMenu.pm
+++ b/lib/DiskstatsMenu.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/DuplicateKeyFinder.pm
+++ b/lib/DuplicateKeyFinder.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/EventAggregator.pm
+++ b/lib/EventAggregator.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/EventTimeline.pm
+++ b/lib/EventTimeline.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/ExecutionThrottler.pm
+++ b/lib/ExecutionThrottler.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/ExplainAnalyzer.pm
+++ b/lib/ExplainAnalyzer.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/FileIterator.pm
+++ b/lib/FileIterator.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/GeneralLogParser.pm
+++ b/lib/GeneralLogParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/HTTPMicro.pm
+++ b/lib/HTTPMicro.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2012 Percona Inc.
+# This program is copyright 2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/HTTPProtocolParser.pm
+++ b/lib/HTTPProtocolParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/IndexLength.pm
+++ b/lib/IndexLength.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2012 Percona Inc.
+# This program is copyright 2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/IndexUsage.pm
+++ b/lib/IndexUsage.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/KeySize.pm
+++ b/lib/KeySize.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011-2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MemcachedEvent.pm
+++ b/lib/MemcachedEvent.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MemcachedProtocolParser.pm
+++ b/lib/MemcachedProtocolParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Percona Inc.
+# This program is copyright 2007-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Mo.pm
+++ b/lib/Mo.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2012 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MockSth.pm
+++ b/lib/MockSth.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MockSync.pm
+++ b/lib/MockSync.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MockSyncStream.pm
+++ b/lib/MockSyncStream.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MySQLConfig.pm
+++ b/lib/MySQLConfig.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MySQLConfigComparer.pm
+++ b/lib/MySQLConfigComparer.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MySQLProtocolParser.pm
+++ b/lib/MySQLProtocolParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Percona Inc.
+# This program is copyright 2007-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/MySQLStatusWaiter.pm
+++ b/lib/MySQLStatusWaiter.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/NibbleIterator.pm
+++ b/lib/NibbleIterator.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/OobNibbleIterator.pm
+++ b/lib/OobNibbleIterator.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/OptionParser.pm
+++ b/lib/OptionParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Outfile.pm
+++ b/lib/Outfile.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Percona/Toolkit.pm
+++ b/lib/Percona/Toolkit.pm
@@ -19,7 +19,7 @@
 # ###########################################################################
 {
 package Percona::Toolkit;
-our $VERSION = '2.1.7';
+our $VERSION = '2.1.8';

 1;
 }
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/PgLogParser.pm
+++ b/lib/PgLogParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2010-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Pingback.pm
+++ b/lib/Pingback.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2012 Percona Inc.
+# This program is copyright 2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Pipeline.pm
+++ b/lib/Pipeline.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2011 Percona Inc.
+# This program is copyright 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/PodParser.pm
+++ b/lib/PodParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Processlist.pm
+++ b/lib/Processlist.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2008-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Progress.pm
+++ b/lib/Progress.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/ProtocolParser.pm
+++ b/lib/ProtocolParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2009-2011 Percona Inc.
+# This program is copyright 2009-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/QueryAdvisorRules.pm
+++ b/lib/QueryAdvisorRules.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2011 Percona Inc.
+# This program is copyright 2010-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/QueryParser.pm
+++ b/lib/QueryParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/QueryReportFormatter.pm
+++ b/lib/QueryReportFormatter.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/QueryReview.pm
+++ b/lib/QueryReview.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2008-2011 Percona Inc.
+# This program is copyright 2008-2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/QueryRewriter.pm
+++ b/lib/QueryRewriter.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/Quoter.pm
+++ b/lib/Quoter.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/RawLogParser.pm
+++ b/lib/RawLogParser.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2012 Percona Inc.
+# This program is copyright 2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/lib/ReadKeyMini.pm
+++ b/lib/ReadKeyMini.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010-2012 Percona Inc.
+# This program is copyright 2010-2012 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
--- a/Show More
+++ b/Show More