Remove $Revision$ and finish re-branding modules. Rename MaatkitTest.pm to PerconaTest.pm. Put copyrights on one line.

2025-09-02 02:34:19 +00:00 · 2011-07-12 15:47:07 -06:00
parent dc72f5bb9e
commit b805f7c92d
158 changed files with 237 additions and 776 deletions
--- a/lib/Advisor.pm
+++ b/lib/Advisor.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010 Percona Inc.
+# This program is copyright 2010-2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Advisor package $Revision: 6830 $
+# Advisor package
 # ###########################################################################
 {
 # Package: Advisor
--- a/lib/AdvisorRules.pm
+++ b/lib/AdvisorRules.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2010 Percona Inc.
+# This program is copyright 2010-2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# AdvisorRules package $Revision: 6813 $
+# AdvisorRules package
 # ###########################################################################
 {
 # Package: AdvisorRules
--- a/lib/BinaryLogParser.pm
+++ b/lib/BinaryLogParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# BinaryLogParser package $Revision: 7522 $
+# BinaryLogParser package
 # ###########################################################################
 {
 # Package: BinaryLogParser
--- a/lib/ChangeHandler.pm
+++ b/lib/ChangeHandler.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ChangeHandler package $Revision: 6785 $
+# ChangeHandler package
 # ###########################################################################
 {
 # Package: ChangeHandler
@@ -260,7 +259,7 @@ sub process_rows {
               # ]
               $row    = shift @$rows;
               my $sql = $self->$func(@$row);
-               $sql   .= " /*maatkit $trace_msg*/" if $trace_msg;
+               $sql   .= " /*percona-toolkit $trace_msg*/" if $trace_msg;
               $self->_take_action($sql, $row->[2]);
            }
         }
--- a/lib/CompareQueryTimes.pm
+++ b/lib/CompareQueryTimes.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# CompareQueryTimes package $Revision: 6785 $
+# CompareQueryTimes package
 # ###########################################################################
 {
 # Package: CompareQueryTimes
--- a/lib/CompareResults.pm
+++ b/lib/CompareResults.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# CompareResults package $Revision: 7096 $
+# CompareResults package
 # ###########################################################################
 {
 # Package: CompareResults
--- a/lib/CompareTableStructs.pm
+++ b/lib/CompareTableStructs.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# CompareTableStructs package $Revision: 6785 $
+# CompareTableStructs package
 # ###########################################################################
 {
 # Package: CompareTableStructs
--- a/lib/CompareWarnings.pm
+++ b/lib/CompareWarnings.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# CompareWarnings package $Revision: 7096 $
+# CompareWarnings package
 # ###########################################################################
 {
 # Package: CompareWarnings
--- a/lib/CopyRowsInsertSelect.pm
+++ b/lib/CopyRowsInsertSelect.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# CopyRowsInsertSelect package $Revision: 7464 $
+# CopyRowsInsertSelect package
 # ###########################################################################
 {
 # Package: CopyRowsInsertSelect
--- a/lib/DSNParser.pm
+++ b/lib/DSNParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# DSNParser package $Revision: 7388 $
+# DSNParser package
 # ###########################################################################
 {
 # Package: DSNParser
--- a/lib/Daemon.pm
+++ b/lib/Daemon.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Daemon package $Revision: 6255 $
+# Daemon package
 # ###########################################################################
 {
 # Package: Daemon
--- a/lib/DuplicateKeyFinder.pm
+++ b/lib/DuplicateKeyFinder.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# DuplicateKeyFinder package $Revision: 7565 $
+# DuplicateKeyFinder package
 # ###########################################################################
 {
 # Package: DuplicateKeyFinder
--- a/lib/EventAggregator.pm
+++ b/lib/EventAggregator.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# EventAggregator package $Revision: 7272 $
+# EventAggregator package
 # ###########################################################################
 {
 # Package: EventAggregator
--- a/lib/EventTimeline.pm
+++ b/lib/EventTimeline.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# EventTimeline package $Revision: 6590 $
+# EventTimeline package
 # ###########################################################################
 {
 # Package: EventTimeline
--- a/lib/ExecutionThrottler.pm
+++ b/lib/ExecutionThrottler.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ExecutionThrottler package $Revision: 5266 $
+# ExecutionThrottler package
 # ###########################################################################
 {
 # Package: ExecutionThrottler
--- a/lib/ExplainAnalyzer.pm
+++ b/lib/ExplainAnalyzer.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ExplainAnalyzer package $Revision: 7096 $
+# ExplainAnalyzer package
 # ###########################################################################
 {
 # Package: ExplainAnalyzer
--- a/lib/FileIterator.pm
+++ b/lib/FileIterator.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# FileIterator package $Revision: 7096 $
+# FileIterator package
 # ###########################################################################
 {
 # Package: FileIterator
--- a/lib/ForeignKeyIterator.pm
+++ b/lib/ForeignKeyIterator.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ForeignKeyIterator package $Revision: 7552 $
+# ForeignKeyIterator package
 # ###########################################################################
 {
 # Package: ForeignKeyIterator
--- a/lib/GeneralLogParser.pm
+++ b/lib/GeneralLogParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# GeneralLogParser package $Revision: 7522 $
+# GeneralLogParser package
 # ###########################################################################
 {
 # Package: GeneralLogParser
--- a/lib/HTTPProtocolParser.pm
+++ b/lib/HTTPProtocolParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# HTTPProtocolParser package $Revision: 5811 $
+# HTTPProtocolParser package
 # ###########################################################################
 {
 # Package: HTTPProtocolParser
--- a/lib/IndexUsage.pm
+++ b/lib/IndexUsage.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# IndexUsage package $Revision: 7096 $
+# IndexUsage package
 # ###########################################################################
 {
 # Package: IndexUsage
--- a/lib/InnoDBStatusParser.pm
+++ b/lib/InnoDBStatusParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2009-2010 Baron Schwartz.
+# This program is copyright 2009-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# InnoDBStatusParser package $Revision: 7096 $
+# InnoDBStatusParser package
 # ###########################################################################
 {
 # Package: InnoDBStatusParser
--- a/lib/KeySize.pm
+++ b/lib/KeySize.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# KeySize package $Revision: 7096 $
+# KeySize package
 # ###########################################################################
 {
 # Package: KeySize
--- a/lib/LogSplitter.pm
+++ b/lib/LogSplitter.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# LogSplitter package $Revision: 7177 $
+# LogSplitter package
 # ###########################################################################
 {
 # Package: LogSplitter
--- a/lib/MaatkitTest.pm
+++ b/lib/MaatkitTest.pm
@@ -1,525 +0,0 @@
-# This program is copyright 2009-2011 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# MaatkitTest package $Revision: 7096 $
-# ###########################################################################
-{
-# Package: MaatkitTest
-# MaatkitTest is a collection of helper-subs for the Maatkit tests.
-# Any file arguments (like no_diff() $expected_output) are relative to
-# PERCONA_TOOLKIT_BRANCH.  So passing "commont/t/samples/foo" means
-# "PERCONA_TOOLKIT_BRANCH/common/t/samples/foo".  Do not BAIL_OUT() because
-# this terminates the *entire* test process; die instead.  All
-# subs are exported by default, so is the variable $trunk, so there's
-# no need to import() in the test scripts.
-package MaatkitTest;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
-
-use Test::More;
-use Time::HiRes qw(usleep);
-use POSIX qw(signal_h);
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
-
-require Exporter;
-our @ISA         = qw(Exporter);
-our %EXPORT_TAGS = ();
-our @EXPORT_OK   = qw();
-our @EXPORT      = qw(
-   output
-   load_data
-   load_file
-   parse_file
-   wait_until
-   wait_for
-   test_log_parser
-   test_protocol_parser
-   test_packet_parser
-   no_diff
-   throws_ok
-   remove_traces
-   test_bash_tool
-   $trunk
-   $dsn_opts
-   $sandbox_version
-);
-
-our $trunk = $ENV{PERCONA_TOOLKIT_BRANCH};
-
-our $sandbox_version = '';
-eval {
-   chomp(my $v = `$trunk/sandbox/test-env version`);
-   $sandbox_version = $v if $v;
-};
-
-our $dsn_opts = [
-   {
-      key  => 'A',
-      desc => 'Default character set',
-      dsn  => 'charset',
-      copy => 1,
-   },
-   {
-      key  => 'D',
-      desc => 'Database to use',
-      dsn  => 'database',
-      copy => 1,
-   },
-   {
-      key  => 'F',
-      desc => 'Only read default options from the given file',
-      dsn  => 'mysql_read_default_file',
-      copy => 1,
-   },
-   {
-      key  => 'h',
-      desc => 'Connect to host',
-      dsn  => 'host',
-      copy => 1,
-   },
-   {
-      key  => 'p',
-      desc => 'Password to use when connecting',
-      dsn  => 'password',
-      copy => 1,
-   },
-   {
-      key  => 'P',
-      desc => 'Port number to use for connection',
-      dsn  => 'port',
-      copy => 1,
-   },
-   {
-      key  => 'S',
-      desc => 'Socket file to use for connection',
-      dsn  => 'mysql_socket',
-      copy => 1,
-   },
-   {
-      key  => 't',
-      desc => 'Table',
-      dsn  => undef,
-      copy => 1,
-   },
-   {
-      key  => 'u',
-      desc => 'User for login if not current user',
-      dsn  => 'user',
-      copy => 1,
-   },
-];
-
-# Runs code, captures and returns its output.
-# Optional arguments:
-#   * file    scalar: capture output to this file (default none)
-#   * stderr  scalar: capture STDERR (default no)
-#   * die     scalar: die if code dies (default no)
-#   * trf     coderef: pass output to this coderef (default none)
-sub output {
-   my ( $code, %args ) = @_;
-   die "I need a code argument" unless $code;
-   my ($file, $stderr, $die, $trf) = @args{qw(file stderr die trf)};
-
-   my $output = '';
-   if ( $file ) { 
-      open *output_fh, '>', $file
-         or die "Cannot open file $file: $OS_ERROR";
-   }
-   else {
-      open *output_fh, '>', \$output
-         or die "Cannot capture output to variable: $OS_ERROR";
-   }
-   local *STDOUT = *output_fh;
-
-   # If capturing STDERR we must dynamically scope (local) STDERR
-   # in the outer scope of the sub.  If we did,
-   #   if ( $args{stderr} ) { local *STDERR; ... }
-   # then STDERR would revert to its original value outside the if
-   # block.
-   local *STDERR     if $args{stderr};  # do in outer scope of this sub
-   *STDERR = *STDOUT if $args{stderr};
-
-   eval { $code->() };
-   close *output_fh;
-   if ( $EVAL_ERROR ) {
-      die $EVAL_ERROR if $die;
-      return $EVAL_ERROR;
-   }
-
-   # Possible transform output before returning it.  This doesn't work
-   # if output was captured to a file.
-   $output = $trf->($output) if $trf;
-
-   return $output;
-}
-
-# Load data from file and removes spaces.  Used to load tcpdump dumps.
-sub load_data {
-   my ( $file ) = @_;
-   $file = "$trunk/$file";
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   (my $data = join('', $contents =~ m/(.*)/g)) =~ s/\s+//g;
-   return $data;
-}
-
-# Slurp file and return its entire contents.
-sub load_file {
-   my ( $file, %args ) = @_;
-   $file = "$trunk/$file";
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   chomp $contents if $args{chomp_contents};
-   return $contents;
-}
-
-sub parse_file {
-   my ( $file, $p, $ea ) = @_;
-   $file = "$trunk/$file";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %args = (
-         next_event => sub { return <$fh>;    },
-         tell       => sub { return tell $fh; },
-         fh         => $fh,
-      );
-      while ( my $e = $p->parse_event(%args) ) {
-         push @e, $e;
-         $ea->aggregate($e) if $ea;
-      }
-      close $fh;
-   };
-   die $EVAL_ERROR if $EVAL_ERROR;
-   return \@e;
-}
-
-# Wait until code returns true.
-sub wait_until {
-   my ( $code, $t, $max_t ) = @_;
-   my $slept     = 0;
-   my $sleep_int = $t || .5;
-   $t     ||= .5;
-   $max_t ||= 5;
-   $t *= 1_000_000;
-   while ( $slept <= $max_t ) {
-      return if $code->();
-      usleep($t);
-      $slept += $sleep_int;
-   }
-   return;
-}
-
-# Wait t seconds for code to return.
-sub wait_for {
-   my ( $code, $t ) = @_;
-   $t ||= 0;
-   my $mask   = POSIX::SigSet->new(&POSIX::SIGALRM);
-   my $action = POSIX::SigAction->new(
-      sub { die },
-      $mask,
-   );
-   my $oldaction = POSIX::SigAction->new();
-   sigaction(&POSIX::SIGALRM, $action, $oldaction);
-   eval {
-      alarm $t;
-      $code->();
-      alarm 0;
-   };
-   if ( $EVAL_ERROR ) {
-      # alarm was raised
-      return 1;
-   }
-   return 0;
-}
-
-sub _read {
-   my ( $fh ) = @_;
-   return <$fh>;
-}
-
-sub test_log_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $p = $args{parser};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map  { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|misc|file|result|num_events|oktorun)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %parser_args = (
-         next_event => sub { return _read($fh); },
-         tell       => sub { return tell($fh);  },
-         fh         => $fh,
-         misc       => $args{misc},
-         oktorun    => $args{oktorun},
-      );
-      while ( my $e = $p->parse_event(%parser_args) ) {
-         push @e, $e;
-      }
-      close $fh;
-   };
-
-   is(
-      $EVAL_ERROR,
-      '',
-      "No error on $args{file}"
-   );
-
-   if ( defined $args{result} ) {
-      is_deeply(
-         \@e,
-         $args{result},
-         $args{file}
-      ) or print "Got: ", Dumper(\@e);
-   }
-
-   if ( defined $args{num_events} ) {
-      is(
-         scalar @e,
-         $args{num_events},
-         "$args{file} num_events"
-      );
-   }
-
-   return \@e;
-}
-
-sub test_protocol_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser protocol file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $parser   = $args{parser};
-   my $protocol = $args{protocol};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|protocol|misc|file|result|num_events|desc)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %parser_args = (
-         next_event => sub { return _read($fh); },
-         tell       => sub { return tell($fh);  },
-         misc       => $args{misc},
-      );
-      while ( my $p = $parser->parse_event(%parser_args) ) {
-         my $e = $protocol->parse_event(%parser_args, event => $p);
-         push @e, $e if $e;
-      }
-      close $fh;
-   };
-
-   is(
-      $EVAL_ERROR,
-      '',
-      "No error on $args{file}"
-   );
-   
-   if ( defined $args{result} ) {
-      is_deeply(
-         \@e,
-         $args{result},
-         $args{file} . ($args{desc} ? ": $args{desc}" : '')
-      ) or print "Got: ", Dumper(\@e);
-   }
-
-   if ( defined $args{num_events} ) {
-      is(
-         scalar @e,
-         $args{num_events},
-         "$args{file} num_events"
-      );
-   }
-
-   return \@e;
-}
-
-sub test_packet_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $parser   = $args{parser};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|misc|file|result|desc|oktorun)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @packets;
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-   my %parser_args = (
-      next_event => sub { return _read($fh); },
-      tell       => sub { return tell($fh);  },
-      misc       => $args{misc},
-      oktorun    => $args{oktorun},
-   );
-   while ( my $packet = $parser->parse_event(%parser_args) ) {
-      push @packets, $packet;
-   }
-
-   # raw_packet is the actual dump text from the file.  It's used
-   # in MySQLProtocolParser but I don't think we need to double-check
-   # it here.  It will make the results very long.
-   foreach my $packet ( @packets ) {
-      delete $packet->{raw_packet};
-   }
-
-   if ( !is_deeply(
-         \@packets,
-         $args{result},
-         "$args{file}" . ($args{desc} ? ": $args{desc}" : '')
-      ) ) {
-      print Dumper(\@packets);
-   }
-
-   return;
-}
-
-# no_diff() compares the STDOUT output of a cmd or code to expected output.
-# Returns true if there are no differences between the two outputs,
-# else returns false.  Dies if the cmd/code dies.  Does not capture STDERR.
-# Args:
-#   * cmd                 scalar or coderef: if cmd is a scalar then the
-#                         cmd is ran via the shell.  if it's a coderef then
-#                         the code is ran.  the latter is preferred because
-#                         it generates test coverage.
-#   * expected_output     scalar: file name relative to PERCONA_TOOLKIT_BRANCH
-#   * args                hash: (optional) may include
-#       update_sample            overwrite expected_output with cmd/code output
-#       keep_output              keep last cmd/code output file
-#   *   trf                      transform cmd/code output before diff
-# The sub dies if cmd or code dies.  STDERR is not captured.
-sub no_diff {
-   my ( $cmd, $expected_output, %args ) = @_;
-   die "I need a cmd argument" unless $cmd;
-   die "I need an expected_output argument" unless $expected_output;
-
-   $expected_output = "$trunk/$expected_output";
-   die "$expected_output does not exist" unless -f $expected_output;
-
-   my $tmp_file      = '/tmp/maatkit-test-output.txt';
-   my $tmp_file_orig = '/tmp/maatkit-test-output-original.txt';
-
-   # Determine cmd type and run it.
-   if ( ref $cmd eq 'CODE' ) {
-      output($cmd, file => $tmp_file);
-   }
-   elsif ( $args{cmd_output} ) {
-      # Copy cmd output to tmp file so we don't with the original.
-      open my $tmp_fh, '>', $tmp_file or die "Cannot open $tmp_file: $OS_ERROR";
-      print $tmp_fh $cmd;
-      close $tmp_fh;
-   }
-   else {
-      `$cmd > $tmp_file`;
-   }
-
-   # Do optional arg stuff.
-   `cp $tmp_file $tmp_file_orig`;
-   if ( my $trf = $args{trf} ) {
-      `$trf $tmp_file_orig > $tmp_file`;
-   }
-   if ( my $sed = $args{sed} ) {
-      foreach my $sed_args ( @{$args{sed}} ) {
-         `sed $sed_args $tmp_file`;
-      }
-   }
-
-   # diff the outputs.
-   my $retval = system("diff $tmp_file $expected_output");
-
-   # diff returns 0 if there were no differences,
-   # so !0 = 1 = no diff in our testing parlance.
-   $retval = $retval >> 8; 
-
-   if ( $retval ) {
-      if ( $ENV{UPDATE_SAMPLES} || $args{update_sample} ) {
-         `cat $tmp_file > $expected_output`;
-         print STDERR "Updated $expected_output\n";
-      }
-   }
-
-   # Remove our tmp files.
-   `rm -f $tmp_file $tmp_file_orig`
-      unless $ENV{KEEP_OUTPUT} || $args{keep_output};
-
-   return !$retval;
-}
-
-sub throws_ok {
-   my ( $code, $pat, $msg ) = @_;
-   eval { $code->(); };
-   like ( $EVAL_ERROR, $pat, $msg );
-}
-
-# Remove /*maatkit ...*/ trace comments from the given SQL statement(s).
-# Traces are added in ChangeHandler::process_rows().
-sub remove_traces {
-   my ( $sql ) = @_;
-   my $trace_pat = qr/ \/\*maatkit .+?\*\//;
-   if ( ref $sql && ref $sql eq 'ARRAY' ) {
-      map { $_ =~ s/$trace_pat//gm } @$sql;
-   }
-   else {
-      $sql =~ s/$trace_pat//gm;
-   }
-   return $sql;
-}
-
-sub test_bash_tool {
-   my ( $tool ) = @_;
-   die "I need a tool argument" unless $tool;
-   my $outfile = "/tmp/$tool-test-results.txt";
-   `rm -rf $outfile >/dev/null`;
-   `$trunk/util/test-bash-tool $tool > $outfile`;
-   print `cat $outfile`;
-   return;
-}
-
-1;
-}
-# ###########################################################################
-# End MaatkitTest package
-# ###########################################################################
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MasterSlave package $Revision: 7525 $
+# MasterSlave package
 # ###########################################################################
 {
 # Package: MasterSlave
--- a/lib/MemcachedEvent.pm
+++ b/lib/MemcachedEvent.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MemcachedEvent package $Revision: 7096 $
+# MemcachedEvent package
 # ###########################################################################
 {
 # Package: MemcachedEvent
--- a/lib/MemcachedProtocolParser.pm
+++ b/lib/MemcachedProtocolParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MemcachedProtocolParser package $Revision: 7521 $
+# MemcachedProtocolParser package
 # ###########################################################################
 {
 # Package: MemcachedProtocolParser
--- a/lib/MockSth.pm
+++ b/lib/MockSth.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -15,7 +14,9 @@
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
-
+# ###########################################################################
+# MockSth package
+# ###########################################################################
 {
 # Package: MockSth
 # MockSth simulates a DBI statement handle without a database connection.
@@ -80,3 +81,6 @@ sub _d {

 1;
 }
+# ###########################################################################
+# End MockSth package
+# ###########################################################################
--- a/lib/MockSync.pm
+++ b/lib/MockSync.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
-
+# ###########################################################################
+# MockSync package
+# ###########################################################################
 {
 # Package: MockSync
 # MockSync simulates a table syncer module.  It's used by RowDiff.t.
@@ -56,3 +58,6 @@ sub key_cols {

 1;
 }
+# ###########################################################################
+# End MockSync package
+# ###########################################################################
--- a/lib/MockSyncStream.pm
+++ b/lib/MockSyncStream.pm
@@ -14,7 +14,9 @@
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
-
+# ###########################################################################
+# MockSyncStream package
+# ###########################################################################
 {
 # Package: MockSyncStream
 # MockSyncStream simulates a <TableSyncStream> module.
@@ -144,3 +146,6 @@ sub _d {

 1;
 }
+# ###########################################################################
+# End MockSyncStream package
+# ###########################################################################
--- a/lib/MySQLConfig.pm
+++ b/lib/MySQLConfig.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MySQLConfig package $Revision: 7403 $
+# MySQLConfig package
 # ###########################################################################
 {
 # Package: MySQLConfig
--- a/lib/MySQLConfigComparer.pm
+++ b/lib/MySQLConfigComparer.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MySQLConfigComparer package $Revision: 7403 $
+# MySQLConfigComparer package
 # ###########################################################################
 {
 # Package: MySQLConfigComparer
--- a/lib/MySQLDump.pm
+++ b/lib/MySQLDump.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2011 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MySQLDump package $Revision: 6345 $
+# MySQLDump package
 # ###########################################################################
 {
 # Package: MySQLDump
--- a/lib/MySQLProtocolParser.pm
+++ b/lib/MySQLProtocolParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# MySQLProtocolParser package $Revision: 7522 $
+# MySQLProtocolParser package
 # ###########################################################################
 {
 # Package: MySQLProtocolParser
--- a/lib/OSCCaptureSync.pm
+++ b/lib/OSCCaptureSync.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# OSCCaptureSync package $Revision: 7463 $
+# OSCCaptureSync package
 # ###########################################################################
 {
 # Package: OSCCaptureSync
--- a/lib/OptionParser.pm
+++ b/lib/OptionParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# OptionParser package $Revision: 7102 $
+# OptionParser package
 # ###########################################################################
 {
 # Package: OptionParser
--- a/lib/Outfile.pm
+++ b/lib/Outfile.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Outfile package $Revision: 5266 $
+# Outfile package
 # ###########################################################################
 {
 # Package: Outfile
--- a/lib/PgLogParser.pm
+++ b/lib/PgLogParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2010 Baron Schwartz.
+# This program is copyright 2010-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# PgLogParser package $Revision: 5835 $
+# PgLogParser package
 # ###########################################################################
 {
 # Package: PgLogParser
--- a/lib/Pipeline.pm
+++ b/lib/Pipeline.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Pipeline package $Revision: 7509 $
+# Pipeline package
 # ###########################################################################
 {
 # Package: Pipeline
--- a/lib/PodParser.pm
+++ b/lib/PodParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# PodParser package $Revision: 7053 $
+# PodParser package
 # ###########################################################################
 {
 # Package: PodParser
@@ -62,7 +62,6 @@ sub new {
   my $self = {
      current_section => '',
      current_item    => '',
-      in_list         => 0,
      items           => {},  # keyed off SECTION
      magic           => {},  # keyed off SECTION->magic ident (without MAGIC_)
      magic_ident     => '',  # set when next para is a magic para
@@ -83,7 +82,7 @@ sub get_magic {
 sub parse_from_file {
   my ( $self, $file ) = @_;
   return unless $file;
-
+   MKDEBUG && _d('Parsing POD in', $file);
   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
   local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
   my $para;
@@ -99,7 +98,7 @@ sub parse_from_file {
         MKDEBUG && _d('cmd:', $cmd, 'name:', $name);
         $self->command($cmd, $name);
      }
-      else {
+      elsif ( $parse_items_from{$self->{current_section}} ) {
         $self->textblock($para);
      }
   }
@@ -113,17 +112,18 @@ sub command {
   my ( $self, $cmd, $name ) = @_;
   
   $name =~ s/\s+\Z//m;  # Remove \n and blank line after name.
-   
-   if  ( $cmd eq 'head1' && $parse_items_from{$name} ) {
+
+   if  ( $cmd eq 'head1' ) {
      MKDEBUG && _d('In section', $name);
      $self->{current_section} = $name;
-      $self->{items}->{$name}  = {};
   }
   elsif ( $cmd eq 'over' ) {
-      MKDEBUG && _d('Start items in', $self->{current_section});
-      $self->{in_list} = 1;
+      if ( $parse_items_from{$name} ) {
+         MKDEBUG && _d('Start items in', $self->{current_section});
+         $self->{items}->{$self->{current_section}} = {};
+      }
   }
-   elsif ( $cmd eq 'item' ) {
+   elsif ( $cmd eq 'item' && $parse_items_from{$self->{current_section}} ) {
      my $pat = $item_pattern_for{ $self->{current_section} };
      my ($item) = $name =~ m/$pat/;
      if ( $item ) {
@@ -137,13 +137,13 @@ sub command {
         warn "Item $name does not match $pat";
      }
   }
-   elsif ( $cmd eq '=back' ) {
-      MKDEBUG && _d('End items');
-      $self->{in_list} = 0;
+   elsif ( $cmd eq 'back' ) {
+      if ( $parse_items_from{$self->{current_section}} ) {
+         MKDEBUG && _d('End items in', $self->{current_section});
+      }
   }
   else {
      $self->{current_section} = '';
-      $self->{in_list}         = 0;
   }
   
   return;
--- a/lib/Processlist.pm
+++ b/lib/Processlist.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2008-2011 Baron Schwartz.
+# This program is copyright 2008-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Processlist package $Revision: 7289 $
+# Processlist package
 # ###########################################################################
 {
 # Package: Processlist
--- a/lib/ProcesslistAggregator.pm
+++ b/lib/ProcesslistAggregator.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ProcesslistAggregator package $Revision: 6590 $
+# ProcesslistAggregator package
 # ###########################################################################
 {
 # Package: ProcesslistAggregator
--- a/lib/Progress.pm
+++ b/lib/Progress.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Progress package $Revision: 7096 $
+# Progress package
 # ###########################################################################
 {
 # Package: Progress
--- a/lib/ProtocolParser.pm
+++ b/lib/ProtocolParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ProtocolParser package $Revision: 7522 $
+# ProtocolParser package
 # ###########################################################################
 {
 # Package: ProtocolParser
--- a/lib/QueryAdvisorRules.pm
+++ b/lib/QueryAdvisorRules.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# QueryAdvisorRules package $Revision: 7473 $
+# QueryAdvisorRules package
 # ###########################################################################
 {
 # Package: QueryAdvisorRules
--- a/lib/QueryParser.pm
+++ b/lib/QueryParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# QueryParser package $Revision: 7452 $
+# QueryParser package
 # ###########################################################################
 {
 # Package: QueryParser
--- a/lib/QueryReportFormatter.pm
+++ b/lib/QueryReportFormatter.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# QueryReportFormatter package $Revision: 7274 $
+# QueryReportFormatter package
 # ###########################################################################
 {
 # Package: QueryReportFormatter
--- a/lib/QueryReview.pm
+++ b/lib/QueryReview.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# QueryReview package $Revision: 7342 $
+# QueryReview package
 # ###########################################################################
 {
 # Package: QueryReview
--- a/lib/QueryRewriter.pm
+++ b/lib/QueryRewriter.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2011 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# QueryRewriter package $Revision: 7473 $
+# QueryRewriter package
 # ###########################################################################
 {
 # Package: QueryRewriter
--- a/lib/Quoter.pm
+++ b/lib/Quoter.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Quoter package $Revision: 6850 $
+# Quoter package
 # ###########################################################################
 {
 # Package: Quoter
--- a/lib/ReportFormatter.pm
+++ b/lib/ReportFormatter.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# ReportFormatter package $Revision: 7473 $
+# ReportFormatter package
 # ###########################################################################
 {
 # Package: ReportFormatter
--- a/lib/Retry.pm
+++ b/lib/Retry.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Retry package $Revision: 7473 $
+# Retry package
 # ###########################################################################
 {
 # Package: Retry
--- a/lib/RowDiff.pm
+++ b/lib/RowDiff.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# RowDiff package $Revision: 5697 $
+# RowDiff package
 # ###########################################################################
 {
 # Package: RowDiff
--- a/lib/Runtime.pm
+++ b/lib/Runtime.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Runtime package $Revision: 7221 $
+# Runtime package
 # ###########################################################################
 {
 # Package: Runtime
--- a/lib/SQLParser.pm
+++ b/lib/SQLParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SQLParser package $Revision: 7565 $
+# SQLParser package
 # ###########################################################################
 {
 # Package: SQLParser
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Sandbox package $Revision: 7140 $
+# Sandbox package
 # ###########################################################################
 {
 # Package: Sandbox
--- a/lib/Schema.pm
+++ b/lib/Schema.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Schema package $Revision: 7565 $
+# Schema package
 # ###########################################################################
 {
 # Package: Schema
--- a/lib/SchemaIterator.pm
+++ b/lib/SchemaIterator.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SchemaIterator package $Revision: 7547 $
+# SchemaIterator package
 # ###########################################################################
 {
 # Package: SchemaIterator
--- a/lib/SimpleTCPDumpParser.pm
+++ b/lib/SimpleTCPDumpParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2011 Baron Schwartz.
+# This program is copyright 2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SimpleTCPDumpParser package $Revision: 7515 $
+# SimpleTCPDumpParser package
 # ###########################################################################
 {
 # Package: SimpleTCPDumpParser
--- a/lib/SlowLogParser.pm
+++ b/lib/SlowLogParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2011 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SlowLogParser package $Revision: 7522 $
+# SlowLogParser package
 # ###########################################################################
 {
 # Package: SlowLogParser
--- a/lib/SlowLogWriter.pm
+++ b/lib/SlowLogWriter.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SlowLogWriter package $Revision: 6590 $
+# SlowLogWriter package
 # ###########################################################################
 {
 # Package: SlowLogWriter
--- a/lib/SysLogParser.pm
+++ b/lib/SysLogParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2010 Baron Schwartz.
+# This program is copyright 2010-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# SysLogParser package $Revision: 5831 $
+# SysLogParser package
 # ###########################################################################
 {
 # Package: SysLogParser
--- a/lib/TCPRequestAggregator.pm
+++ b/lib/TCPRequestAggregator.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2011 Baron Schwartz.
+# This program is copyright 2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TCPRequestAggregator package $Revision: 7515 $
+# TCPRequestAggregator package
 # ###########################################################################
 {
 # Package: TCPRequestAggregator
--- a/lib/TableChecksum.pm
+++ b/lib/TableChecksum.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableChecksum package $Revision: 7080 $
+# TableChecksum package
 # ###########################################################################
 {
 # Package: TableChecksum
--- a/lib/TableChunker.pm
+++ b/lib/TableChunker.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableChunker package $Revision: 7169 $
+# TableChunker package
 # ###########################################################################
 {
 # Package: TableChunker
--- a/lib/TableNibbler.pm
+++ b/lib/TableNibbler.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableNibbler package $Revision: 5266 $
+# TableNibbler package
 # ###########################################################################
 {
 # Package: TableNibbler
--- a/lib/TableParser.pm
+++ b/lib/TableParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableParser package $Revision: 7550 $
+# TableParser package
 # ###########################################################################
 {
 # Package: TableParser
--- a/lib/TableSyncChunk.pm
+++ b/lib/TableSyncChunk.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableSyncChunk package $Revision: 6389 $
+# TableSyncChunk package
 # ###########################################################################
 {
 # Package: TableSyncChunk
--- a/lib/TableSyncGroupBy.pm
+++ b/lib/TableSyncGroupBy.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableSyncGroupBy package $Revision: 5697 $
+# TableSyncGroupBy package
 # ###########################################################################
 {
 # Package: TableSyncGroupBy
--- a/lib/TableSyncNibble.pm
+++ b/lib/TableSyncNibble.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableSyncNibble package $Revision: 6511 $
+# TableSyncNibble package
 # ###########################################################################
 {
 # Package: TableSyncNibble
--- a/lib/TableSyncStream.pm
+++ b/lib/TableSyncStream.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableSyncStream package $Revision: 5697 $
+# TableSyncStream package
 # ###########################################################################
 {
 # Package: TableSyncStream
--- a/lib/TableSyncer.pm
+++ b/lib/TableSyncer.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableSyncer package $Revision: 7528 $
+# TableSyncer package
 # ###########################################################################
 {
 # Package: TableSyncer
--- a/lib/TableUsage.pm
+++ b/lib/TableUsage.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TableUsage package $Revision: 7498 $
+# TableUsage package
 # ###########################################################################
 {
 # Package: TableUsage
--- a/lib/TcpdumpParser.pm
+++ b/lib/TcpdumpParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2010 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TcpdumpParser package $Revision: 7505 $
+# TcpdumpParser package
 # ###########################################################################
 {
 # Package: TcpdumpParser
--- a/lib/TextResultSetParser.pm
+++ b/lib/TextResultSetParser.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TextResultSetParser package $Revision: 6898 $
+# TextResultSetParser package
 # ###########################################################################
 {
 # Package: TextResultSetParser
--- a/lib/TimeSeriesTrender.pm
+++ b/lib/TimeSeriesTrender.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# TimeSeriesTrender package $Revision: 7096 $
+# TimeSeriesTrender package
 # ###########################################################################
 {
 # Package: TimeSeriesTrender
--- a/lib/Transformers.pm
+++ b/lib/Transformers.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Transformers package $Revision: 7226 $
+# Transformers package
 # ###########################################################################
 {
 # Package: Transformers
--- a/lib/UpgradeReportFormatter.pm
+++ b/lib/UpgradeReportFormatter.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# UpgradeReportFormatter package $Revision: 7193 $
+# UpgradeReportFormatter package
 # ###########################################################################
 {
 # Package: UpgradeReportFormatter
--- a/lib/VariableAdvisorRules.pm
+++ b/lib/VariableAdvisorRules.pm
@@ -15,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# VariableAdvisorRules package $Revision: 6821 $
+# VariableAdvisorRules package
 # ###########################################################################
 {
 # Package: VariableAdvisorRules
--- a/lib/VersionParser.pm
+++ b/lib/VersionParser.pm
@@ -1,5 +1,4 @@
-# This program is copyright 2011 Percona Inc.
-# This program is copyright 2007-2009 Baron Schwartz.
+# This program is copyright 2007-2011 Baron Schwartz, 2011 Percona Inc.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -16,7 +15,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# VersionParser package $Revision: 6667 $
+# VersionParser package
 # ###########################################################################
 {
 # Package: VersionParser
--- a/t/lib/Advisor.t
+++ b/t/lib/Advisor.t
@@ -11,7 +11,7 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More tests => 5;

-use MaatkitTest;
+use PerconaTest;
 use QueryAdvisorRules;
 use Advisor;
 use PodParser;
--- a/t/lib/BinaryLogParser.t
+++ b/t/lib/BinaryLogParser.t
@@ -11,7 +11,7 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More tests => 7;

-use MaatkitTest;
+use PerconaTest;
 use BinaryLogParser;

 my $p = new BinaryLogParser();
--- a/t/lib/ChangeHandler.t
+++ b/t/lib/ChangeHandler.t
@@ -15,7 +15,7 @@ use ChangeHandler;
 use Quoter;
 use DSNParser;
 use Sandbox;
-use MaatkitTest;
+use PerconaTest;

 my $dp  = new DSNParser(opts => $dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -463,7 +463,7 @@ $ch->process_rows(1, "trace");

 is_deeply(
   \@rows,
-   ["INSERT INTO `test`.`foo`(`a`, `b`) VALUES ('1', '2') /*maatkit trace*/",],
+   ["INSERT INTO `test`.`foo`(`a`, `b`) VALUES ('1', '2') /*percona-toolkit trace*/",],
   "process_rows() appends trace msg to SQL statements"
 );

--- a/t/lib/CompareQueryTimes.t
+++ b/t/lib/CompareQueryTimes.t
@@ -16,7 +16,7 @@ use Transformers;
 use DSNParser;
 use Sandbox;
 use CompareQueryTimes;
-use MaatkitTest;
+use PerconaTest;

 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
--- a/t/lib/CompareResults.t
+++ b/t/lib/CompareResults.t
@@ -30,7 +30,7 @@ use Transformers;
 use Retry;
 use Sandbox;
 use CompareResults;
-use MaatkitTest;
+use PerconaTest;

 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -136,7 +136,7 @@ isa_ok($cr, 'CompareResults');
 );

 $i = 0;
-MaatkitTest::wait_until(
+PerconaTest::wait_until(
   sub {
      my $r;
      eval {
@@ -355,7 +355,7 @@ isa_ok($cr, 'CompareResults');
 );

 $i = 0;
-MaatkitTest::wait_until(
+PerconaTest::wait_until(
   sub {
      my $r;
      eval {
--- a/t/lib/CompareWarnings.t
+++ b/t/lib/CompareWarnings.t
@@ -18,7 +18,7 @@ use Transformers;
 use DSNParser;
 use Sandbox;
 use CompareWarnings;
-use MaatkitTest;
+use PerconaTest;

 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
--- a/t/lib/CopyRowsInsertSelect.t
+++ b/t/lib/CopyRowsInsertSelect.t
@@ -1,9 +1,9 @@
 #!/usr/bin/perl

 BEGIN {
-   die "The MAATKIT_WORKING_COPY environment variable is not set.  See http://code.google.com/p/maatkit/wiki/Testing"
-      unless $ENV{MAATKIT_WORKING_COPY} && -d $ENV{MAATKIT_WORKING_COPY};
-   unshift @INC, "$ENV{MAATKIT_WORKING_COPY}/common";
+   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;
@@ -13,7 +13,7 @@ use Test::More;

 use DSNParser;
 use Sandbox;
-use MaatkitTest;
+use PerconaTest;
 use Progress;
 use Transformers;
 use Retry;
@@ -46,7 +46,7 @@ my $osc    = new CopyRowsInsertSelect(Retry => $rr);
 my $msg    = sub { print "$_[0]\n"; };
 my $output = "";

-$sb->load_file("master", "common/t/samples/osc/tbl001.sql");
+$sb->load_file("master", "t/lib/samples/osc/tbl001.sql");
 $dbh->do("USE osc");

 $osc->copy(
@@ -83,7 +83,7 @@ $output = output( sub {
 ok(
   no_diff(
      $output,
-      "common/t/samples/osc/copyins001.txt",
+      "t/lib/samples/osc/copyins001.txt",
      cmd_output => 1,
   ),
   "Prints 2 SQL statments for the 2 chunks"
--- a/t/lib/DSNParser.t
+++ b/t/lib/DSNParser.t
@@ -13,7 +13,7 @@ use Test::More tests => 27;

 use DSNParser;
 use OptionParser;
-use MaatkitTest;
+use PerconaTest;

 my $opts = [
   {
--- a/t/lib/Daemon.t
+++ b/t/lib/Daemon.t
@@ -13,7 +13,7 @@ use Test::More tests => 23;

 use Daemon;
 use OptionParser;
-use MaatkitTest;
+use PerconaTest;

 my $o = new OptionParser(file => "$trunk/t/lib/samples/daemonizes.pl");
 my $d = new Daemon(o=>$o);
--- a/t/lib/DuplicateKeyFinder.t
+++ b/t/lib/DuplicateKeyFinder.t
@@ -14,7 +14,7 @@ use Test::More tests => 37;
 use DuplicateKeyFinder;
 use Quoter;
 use TableParser;
-use MaatkitTest;
+use PerconaTest;

 my $dk = new DuplicateKeyFinder();
 my $q  = new Quoter();
--- a/t/lib/EventAggregator.t
+++ b/t/lib/EventAggregator.t
@@ -17,7 +17,7 @@ use QueryParser;
 use SlowLogParser;
 use BinaryLogParser;
 use Transformers;
-use MaatkitTest;
+use PerconaTest;

 my $qr = new QueryRewriter();
 my $qp = new QueryParser();
--- a/t/lib/EventTimeline.t
+++ b/t/lib/EventTimeline.t
@@ -14,7 +14,7 @@ use Test::More tests => 3;
 use Transformers;
 use QueryRewriter;
 use EventTimeline;
-use MaatkitTest;
+use PerconaTest;

 my $qr = new QueryRewriter();
 my ( $result, $events, $et, $expected );
--- a/t/lib/ExecutionThrottler.t
+++ b/t/lib/ExecutionThrottler.t
@@ -12,7 +12,7 @@ use English qw(-no_match_vars);
 use Test::More tests => 12;

 use ExecutionThrottler;
-use MaatkitTest;
+use PerconaTest;

 use constant MKDEBUG => $ENV{MKDEBUG};

--- a/t/lib/ExplainAnalyzer.t
+++ b/t/lib/ExplainAnalyzer.t
@@ -22,7 +22,7 @@ use QueryRewriter;
 use QueryParser;
 use DSNParser;
 use Sandbox;
-use MaatkitTest;
+use PerconaTest;

 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
--- a/t/lib/FileIterator.t
+++ b/t/lib/FileIterator.t
@@ -12,7 +12,7 @@ use English qw(-no_match_vars);
 use Test::More tests => 12;

 use FileIterator;
-use MaatkitTest;
+use PerconaTest;

 use constant MKDEBUG => $ENV{MKDEBUG} || 0;

--- a/t/lib/ForeignKeyIterator.t
+++ b/t/lib/ForeignKeyIterator.t
@@ -19,7 +19,7 @@ use Quoter;
 use TableParser;
 use DSNParser;
 use OptionParser;
-use MaatkitTest;
+use PerconaTest;

 use constant MKDEBUG => $ENV{MKDEBUG} || 0;

--- a/t/lib/GeneralLogParser.t
+++ b/t/lib/GeneralLogParser.t
@@ -12,7 +12,7 @@ use English qw(-no_match_vars);
 use Test::More tests => 7;

 use GeneralLogParser;
-use MaatkitTest;
+use PerconaTest;

 my $p = new GeneralLogParser();

--- a/t/lib/HTTPProtocolParser.t
+++ b/t/lib/HTTPProtocolParser.t
@@ -14,7 +14,7 @@ use Test::More tests => 16;
 use TcpdumpParser;
 use ProtocolParser;
 use HTTPProtocolParser;
-use MaatkitTest;
+use PerconaTest;

 my $tcpdump  = new TcpdumpParser();
 my $protocol; # Create a new HTTPProtocolParser for each test.
--- a/t/lib/IndexUsage.t
+++ b/t/lib/IndexUsage.t
@@ -19,7 +19,7 @@ use DSNParser;
 use Transformers;
 use QueryRewriter;
 use Sandbox;
-use MaatkitTest;
+use PerconaTest;

 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
--- a/Show More
+++ b/Show More