Merge lp:~mauricio-stekl/percona-toolkit/pt-docs-percona-theme into lp:percona-toolkit/2.0

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

Unmerged revisions

126. By Mauricio Stekl on 2011-12-29

first import of Makefile

125. By Mauricio Stekl on 2011-12-29

import new favicon

124. By Mauricio Stekl on 2011-12-29

first import of static rst

123. By Mauricio Stekl on 2011-12-29

modifications to use static index and instalattion rst files

122. By Mauricio Stekl on 2011-12-29

added configuration to use percona theme

121. By Mauricio Stekl on 2011-12-29

Added files for Percona website theme

120. By Daniel Nichter on 2011-12-22

Add download link to release notes.

119. By Daniel Nichter on 2011-12-22

Write 1.0.2 release notes.

118. By Daniel Nichter on 2011-12-22

Updates for 1.0.2 release.

117. By Daniel Nichter on 2011-12-22

Update Changelog for 1.0.2.

=== modified file 'Changelog'
--- Changelog	2011-10-11 14:31:42 +0000
+++ Changelog	2011-12-29 16:12:24 +0000
@@ -1,7 +1,23 @@
 Changelog for Percona Toolkit
 
-  * Fixed bug 821717: pt-tcp-model --type=requests crashes
-
+<<<<<<< TREE
+  * Fixed bug 821717: pt-tcp-model --type=requests crashes
+
+=======
+v1.0.2 released 2011-12-22
+
+  * Fixed bug 856065: pt-trend does not work
+  * Fixed bug 887688: Prepared statements crash pt-query-digest
+  * Fixed bug 903513: MKDEBUG should be PTDEBUG
+  * Fixed bug 857091: pt-sift downloads http://percona.com/get/pt-pmp, which does not work
+  * Fixed bug 857104: pt-sift tries to invoke mext, should be pt-mext
+  * Fixed bug 884504: pt-stalk doesn't check pt-collect
+  * Fixed bug 821717: pt-tcp-model --type=requests crashes
+  * Fixed bug 844038: pt-online-schema-change documentation example w/drop-tmp-table does not work
+  * Fixed bug 898663: Typo in pt-log-player documentation
+  * Fixed bug 903753: Typo in pt-table-checksum documentation
+
+>>>>>>> MERGE-SOURCE
 v1.0.1 released 2011-09-01
 
   * Fixed bug 819421: MasterSlave::is_replication_thread() doesn't match all

=== modified file 'MANIFEST'
--- MANIFEST	2011-08-05 21:32:28 +0000
+++ MANIFEST	2011-12-29 16:12:24 +0000
@@ -1,8 +1,8 @@
+COPYING
 Changelog
-COPYING
 INSTALL
+MANIFEST
 Makefile.PL
-MANIFEST
 README
 bin/pt-archiver
 bin/pt-collect

=== modified file 'Makefile.PL'
--- Makefile.PL	2011-09-01 16:00:38 +0000
+++ Makefile.PL	2011-12-29 16:12:24 +0000
@@ -2,7 +2,7 @@
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '1.0.1',
+    VERSION   => '1.0.2',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1',

=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2011-09-01 16:00:38 +0000
+++ bin/pt-archiver	2011-12-29 16:12:24 +0000
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # ###########################################################################
 # OptionParser package
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 use Getopt::Long;
@@ -106,7 +106,7 @@
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
    if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      MKDEBUG && _d('Parsing DSN OPTIONS');
+      PTDEBUG && _d('Parsing DSN OPTIONS');
       my $dsn_attribs = {
          dsn  => 1,
          copy => 1,
@@ -150,7 +150,7 @@
 
    if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
       $self->{version} = $1;
-      MKDEBUG && _d($self->{version});
+      PTDEBUG && _d($self->{version});
    }
 
    return;
@@ -187,7 +187,7 @@
       chomp $para;
       $para =~ s/\s+/ /g;
       $para =~ s/$POD_link_re/$1/go;
-      MKDEBUG && _d('Option rule:', $para);
+      PTDEBUG && _d('Option rule:', $para);
       push @rules, $para;
    }
 
@@ -196,7 +196,7 @@
    do {
       if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
          chomp $para;
-         MKDEBUG && _d($para);
+         PTDEBUG && _d($para);
          my %attribs;
 
          $para = <$fh>; # read next paragraph, possibly attributes
@@ -215,7 +215,7 @@
             $para = <$fh>; # read next paragraph, probably short help desc
          }
          else {
-            MKDEBUG && _d('Option has no attributes');
+            PTDEBUG && _d('Option has no attributes');
          }
 
          $para =~ s/\s+\Z//g;
@@ -223,7 +223,7 @@
          $para =~ s/$POD_link_re/$1/go;
 
          $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         MKDEBUG && _d('Short help:', $para);
+         PTDEBUG && _d('Short help:', $para);
 
          die "No description after option spec $option" if $para =~ m/^=item/;
 
@@ -261,7 +261,7 @@
 
    foreach my $opt ( @specs ) {
       if ( ref $opt ) { # It's an option spec, not a rule.
-         MKDEBUG && _d('Parsing opt spec:',
+         PTDEBUG && _d('Parsing opt spec:',
             map { ($_, '=>', $opt->{$_}) } keys %$opt);
 
          my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
@@ -274,7 +274,7 @@
          $self->{opts}->{$long} = $opt;
 
          if ( length $long == 1 ) {
-            MKDEBUG && _d('Long opt', $long, 'looks like short opt');
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
             $self->{short_opts}->{$long} = $long;
          }
 
@@ -300,14 +300,14 @@
 
          my ( $type ) = $opt->{spec} =~ m/=(.)/;
          $opt->{type} = $type;
-         MKDEBUG && _d($long, 'type:', $type);
+         PTDEBUG && _d($long, 'type:', $type);
 
 
          $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
 
          if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
             $self->{defaults}->{$long} = defined $def ? $def : 1;
-            MKDEBUG && _d($long, 'default:', $def);
+            PTDEBUG && _d($long, 'default:', $def);
          }
 
          if ( $long eq 'config' ) {
@@ -316,13 +316,13 @@
 
          if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
             $disables{$long} = $dis;
-            MKDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
          }
 
          $self->{opts}->{$long} = $opt;
       }
       else { # It's an option rule, not a spec.
-         MKDEBUG && _d('Parsing rule:', $opt); 
+         PTDEBUG && _d('Parsing rule:', $opt); 
          push @{$self->{rules}}, $opt;
          my @participants = $self->_get_participants($opt);
          my $rule_ok = 0;
@@ -330,17 +330,17 @@
          if ( $opt =~ m/mutually exclusive|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{mutex}}, \@participants;
-            MKDEBUG && _d(@participants, 'are mutually exclusive');
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
          }
          if ( $opt =~ m/at least one|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{atleast1}}, \@participants;
-            MKDEBUG && _d(@participants, 'require at least one');
+            PTDEBUG && _d(@participants, 'require at least one');
          }
          if ( $opt =~ m/default to/ ) {
             $rule_ok = 1;
             $self->{defaults_to}->{$participants[0]} = $participants[1];
-            MKDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
          }
          if ( $opt =~ m/restricted to option groups/ ) {
             $rule_ok = 1;
@@ -354,7 +354,7 @@
          if( $opt =~ m/accepts additional command-line arguments/ ) {
             $rule_ok = 1;
             $self->{strict} = 0;
-            MKDEBUG && _d("Strict mode disabled by rule");
+            PTDEBUG && _d("Strict mode disabled by rule");
          }
 
          die "Unrecognized option rule: $opt" unless $rule_ok;
@@ -364,7 +364,7 @@
    foreach my $long ( keys %disables ) {
       my @participants = $self->_get_participants($disables{$long});
       $self->{disables}->{$long} = \@participants;
-      MKDEBUG && _d('Option', $long, 'disables', @participants);
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
    }
 
    return; 
@@ -378,7 +378,7 @@
          unless exists $self->{opts}->{$long};
       push @participants, $long;
    }
-   MKDEBUG && _d('Participants for', $str, ':', @participants);
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
    return @participants;
 }
 
@@ -401,7 +401,7 @@
       die "Cannot set default for nonexistent option $long"
          unless exists $self->{opts}->{$long};
       $self->{defaults}->{$long} = $defaults{$long};
-      MKDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
    }
    return;
 }
@@ -430,7 +430,7 @@
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
-   MKDEBUG && _d('Got option', $long, '=', $val);
+   PTDEBUG && _d('Got option', $long, '=', $val);
 }
 
 sub get_opts {
@@ -461,7 +461,7 @@
             if ( $self->got('config') ) {
                die $EVAL_ERROR;
             }
-            elsif ( MKDEBUG ) {
+            elsif ( PTDEBUG ) {
                _d($EVAL_ERROR);
             }
          }
@@ -528,7 +528,7 @@
             if ( exists $self->{disables}->{$long} ) {
                my @disable_opts = @{$self->{disables}->{$long}};
                map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               MKDEBUG && _d('Unset options', @disable_opts,
+               PTDEBUG && _d('Unset options', @disable_opts,
                   'because', $long,'disables them');
             }
 
@@ -577,7 +577,7 @@
             delete $long[$i];
          }
          else {
-            MKDEBUG && _d('Temporarily failed to parse', $long);
+            PTDEBUG && _d('Temporarily failed to parse', $long);
          }
       }
 
@@ -601,12 +601,12 @@
    my $val = $opt->{value};
 
    if ( $val && $opt->{type} eq 'm' ) {  # type time
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
       my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
       if ( !$suffix ) {
          my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
          $suffix = $s || 's';
-         MKDEBUG && _d('No suffix given; using', $suffix, 'for',
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
             $opt->{long}, '(value:', $val, ')');
       }
       if ( $suffix =~ m/[smhd]/ ) {
@@ -615,23 +615,23 @@
               : $suffix eq 'h' ? $num * 3600     # Hours
               :                  $num * 86400;   # Days
          $opt->{value} = ($prefix || '') . $val;
-         MKDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
       }
       else {
          $self->save_error("Invalid time suffix for --$opt->{long}");
       }
    }
    elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
       my $prev = {};
       my $from_key = $self->{defaults_to}->{ $opt->{long} };
       if ( $from_key ) {
-         MKDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
          if ( $self->{opts}->{$from_key}->{parsed} ) {
             $prev = $self->{opts}->{$from_key}->{value};
          }
          else {
-            MKDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
                $from_key, 'parsed');
             return;
          }
@@ -640,7 +640,7 @@
       $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
       $self->_parse_size($opt, $val);
    }
    elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
@@ -650,7 +650,7 @@
       $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
    }
    else {
-      MKDEBUG && _d('Nothing to validate for option',
+      PTDEBUG && _d('Nothing to validate for option',
          $opt->{long}, 'type', $opt->{type}, 'value', $val);
    }
 
@@ -724,11 +724,11 @@
    $file ||= $self->{file} || __FILE__;
 
    if ( !$self->{description} || !$self->{usage} ) {
-      MKDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
       my %synop = $self->_parse_synopsis($file);
       $self->{description} ||= $synop{description};
       $self->{usage}       ||= $synop{usage};
-      MKDEBUG && _d("Description:", $self->{description},
+      PTDEBUG && _d("Description:", $self->{description},
          "\nUsage:", $self->{usage});
    }
 
@@ -943,7 +943,7 @@
    my ( $self, $opt, $val ) = @_;
 
    if ( lc($val || '') eq 'null' ) {
-      MKDEBUG && _d('NULL size for', $opt->{long});
+      PTDEBUG && _d('NULL size for', $opt->{long});
       $opt->{value} = 'null';
       return;
    }
@@ -953,7 +953,7 @@
    if ( defined $num ) {
       if ( $factor ) {
          $num *= $factor_for{$factor};
-         MKDEBUG && _d('Setting option', $opt->{y},
+         PTDEBUG && _d('Setting option', $opt->{y},
             'to num', $num, '* factor', $factor);
       }
       $opt->{value} = ($pre || '') . $num;
@@ -977,7 +977,7 @@
 sub _parse_synopsis {
    my ( $self, $file ) = @_;
    $file ||= $self->{file} || __FILE__;
-   MKDEBUG && _d("Parsing SYNOPSIS in", $file);
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
 
    local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
    open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
@@ -990,7 +990,7 @@
       push @synop, $para;
    }
    close $fh;
-   MKDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
    my ($usage, $desc) = @synop;
    die "The SYNOPSIS section in $file is not formatted properly"
       unless $usage && $desc;
@@ -1017,7 +1017,7 @@
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
-if ( MKDEBUG ) {
+if ( PTDEBUG ) {
    print '# ', $^X, ' ', $], "\n";
    if ( my $uname = `uname -a` ) {
       $uname =~ s/\s+/ /g;
@@ -1047,7 +1047,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -1092,7 +1092,7 @@
 
    my @defs   = $ddl =~ m/^(\s+`.*?),?$/gm;
    my @cols   = map { $_ =~ m/`([^`]+)`/ } @defs;
-   MKDEBUG && _d('Table cols:', join(', ', map { "`$_`" } @cols));
+   PTDEBUG && _d('Table cols:', join(', ', map { "`$_`" } @cols));
 
    my %def_for;
    @def_for{@cols} = @defs;
@@ -1153,7 +1153,7 @@
       }
       sort keys %{$tbl->{keys}};
 
-   MKDEBUG && _d('Indexes sorted best-first:', join(', ', @indexes));
+   PTDEBUG && _d('Indexes sorted best-first:', join(', ', @indexes));
    return @indexes;
 }
 
@@ -1171,7 +1171,7 @@
          ($best) = $self->sort_indexes($tbl);
       }
    }
-   MKDEBUG && _d('Best index found is', $best);
+   PTDEBUG && _d('Best index found is', $best);
    return $best;
 }
 
@@ -1180,25 +1180,25 @@
    return () unless $where;
    my $sql = 'EXPLAIN SELECT * FROM ' . $quoter->quote($database, $table)
       . ' WHERE ' . $where;
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    my $expl = $dbh->selectrow_hashref($sql);
    $expl = { map { lc($_) => $expl->{$_} } keys %$expl };
    if ( $expl->{possible_keys} ) {
-      MKDEBUG && _d('possible_keys =', $expl->{possible_keys});
+      PTDEBUG && _d('possible_keys =', $expl->{possible_keys});
       my @candidates = split(',', $expl->{possible_keys});
       my %possible   = map { $_ => 1 } @candidates;
       if ( $expl->{key} ) {
-         MKDEBUG && _d('MySQL chose', $expl->{key});
+         PTDEBUG && _d('MySQL chose', $expl->{key});
          unshift @candidates, grep { $possible{$_} } split(',', $expl->{key});
-         MKDEBUG && _d('Before deduping:', join(', ', @candidates));
+         PTDEBUG && _d('Before deduping:', join(', ', @candidates));
          my %seen;
          @candidates = grep { !$seen{$_}++ } @candidates;
       }
-      MKDEBUG && _d('Final list:', join(', ', @candidates));
+      PTDEBUG && _d('Final list:', join(', ', @candidates));
       return @candidates;
    }
    else {
-      MKDEBUG && _d('No keys in possible_keys');
+      PTDEBUG && _d('No keys in possible_keys');
       return ();
    }
 }
@@ -1212,66 +1212,66 @@
    my ($dbh, $db, $tbl) = @args{@required_args};
    my $q      = $self->{Quoter};
    my $db_tbl = $q->quote($db, $tbl);
-   MKDEBUG && _d('Checking', $db_tbl);
+   PTDEBUG && _d('Checking', $db_tbl);
 
    my $sql = "SHOW TABLES FROM " . $q->quote($db)
            . ' LIKE ' . $q->literal_like($tbl);
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    my $row;
    eval {
       $row = $dbh->selectrow_arrayref($sql);
    };
    if ( $EVAL_ERROR ) {
-      MKDEBUG && _d($EVAL_ERROR);
+      PTDEBUG && _d($EVAL_ERROR);
       return 0;
    }
    if ( !$row->[0] || $row->[0] ne $tbl ) {
-      MKDEBUG && _d('Table does not exist');
+      PTDEBUG && _d('Table does not exist');
       return 0;
    }
 
-   MKDEBUG && _d('Table exists; no privs to check');
+   PTDEBUG && _d('Table exists; no privs to check');
    return 1 unless $args{all_privs};
 
    $sql = "SHOW FULL COLUMNS FROM $db_tbl";
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    eval {
       $row = $dbh->selectrow_hashref($sql);
    };
    if ( $EVAL_ERROR ) {
-      MKDEBUG && _d($EVAL_ERROR);
+      PTDEBUG && _d($EVAL_ERROR);
       return 0;
    }
    if ( !scalar keys %$row ) {
-      MKDEBUG && _d('Table has no columns:', Dumper($row));
+      PTDEBUG && _d('Table has no columns:', Dumper($row));
       return 0;
    }
    my $privs = $row->{privileges} || $row->{Privileges};
 
    $sql = "DELETE FROM $db_tbl LIMIT 0";
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    eval {
       $dbh->do($sql);
    };
    my $can_delete = $EVAL_ERROR ? 0 : 1;
 
-   MKDEBUG && _d('User privs on', $db_tbl, ':', $privs,
+   PTDEBUG && _d('User privs on', $db_tbl, ':', $privs,
       ($can_delete ? 'delete' : ''));
 
    if ( !($privs =~ m/select/ && $privs =~ m/insert/ && $privs =~ m/update/
           && $can_delete) ) {
-      MKDEBUG && _d('User does not have all privs');
+      PTDEBUG && _d('User does not have all privs');
       return 0;
    }
 
-   MKDEBUG && _d('User has all privs');
+   PTDEBUG && _d('User has all privs');
    return 1;
 }
 
 sub get_engine {
    my ( $self, $ddl, $opts ) = @_;
    my ( $engine ) = $ddl =~ m/\).*?(?:ENGINE|TYPE)=(\w+)/;
-   MKDEBUG && _d('Storage engine:', $engine);
+   PTDEBUG && _d('Storage engine:', $engine);
    return $engine || undef;
 }
 
@@ -1287,7 +1287,7 @@
       next KEY if $key =~ m/FOREIGN/;
 
       my $key_ddl = $key;
-      MKDEBUG && _d('Parsed key:', $key_ddl);
+      PTDEBUG && _d('Parsed key:', $key_ddl);
 
       if ( $engine !~ m/MEMORY|HEAP/ ) {
          $key =~ s/USING HASH/USING BTREE/;
@@ -1313,7 +1313,7 @@
       }
       $name =~ s/`//g;
 
-      MKDEBUG && _d( $name, 'key cols:', join(', ', map { "`$_`" } @cols));
+      PTDEBUG && _d( $name, 'key cols:', join(', ', map { "`$_`" } @cols));
 
       $keys->{$name} = {
          name         => $name,
@@ -1335,7 +1335,7 @@
          elsif ( $this_key->{is_unique} && !$this_key->{is_nullable} ) {
             $clustered_key = $this_key->{name};
          }
-         MKDEBUG && $clustered_key && _d('This key is the clustered key');
+         PTDEBUG && $clustered_key && _d('This key is the clustered key');
       }
    }
 
@@ -1403,7 +1403,7 @@
       }
       grep { $_->{name} ne $clustered_key }
       values %{$tbl_struct->{keys}};
-      MKDEBUG && _d('Secondary indexes:', Dumper(\@sec_indexes));
+      PTDEBUG && _d('Secondary indexes:', Dumper(\@sec_indexes));
 
       if ( @sec_indexes ) {
          $sec_indexes_ddl = join(' ', @sec_indexes);
@@ -1413,7 +1413,7 @@
       $ddl =~ s/,(\n\) )/$1/s;
    }
    else {
-      MKDEBUG && _d('Not removing secondary indexes from',
+      PTDEBUG && _d('Not removing secondary indexes from',
          $tbl_struct->{engine}, 'table');
    }
 
@@ -1448,7 +1448,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 0;
@@ -1471,7 +1471,7 @@
       if ( !$opt->{key} || !$opt->{desc} ) {
          die "Invalid DSN option: ", Dumper($opt);
       }
-      MKDEBUG && _d('DSN option:',
+      PTDEBUG && _d('DSN option:',
          join(', ',
             map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
                keys %$opt
@@ -1489,7 +1489,7 @@
 sub prop {
    my ( $self, $prop, $value ) = @_;
    if ( @_ > 2 ) {
-      MKDEBUG && _d('Setting', $prop, 'property');
+      PTDEBUG && _d('Setting', $prop, 'property');
       $self->{$prop} = $value;
    }
    return $self->{$prop};
@@ -1498,10 +1498,10 @@
 sub parse {
    my ( $self, $dsn, $prev, $defaults ) = @_;
    if ( !$dsn ) {
-      MKDEBUG && _d('No DSN to parse');
+      PTDEBUG && _d('No DSN to parse');
       return;
    }
-   MKDEBUG && _d('Parsing', $dsn);
+   PTDEBUG && _d('Parsing', $dsn);
    $prev     ||= {};
    $defaults ||= {};
    my %given_props;
@@ -1513,23 +1513,23 @@
          $given_props{$prop_key} = $prop_val;
       }
       else {
-         MKDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
          $given_props{h} = $dsn_part;
       }
    }
 
    foreach my $key ( keys %$opts ) {
-      MKDEBUG && _d('Finding value for', $key);
+      PTDEBUG && _d('Finding value for', $key);
       $final_props{$key} = $given_props{$key};
       if (   !defined $final_props{$key}
            && defined $prev->{$key} && $opts->{$key}->{copy} )
       {
          $final_props{$key} = $prev->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from previous DSN');
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
       }
       if ( !defined $final_props{$key} ) {
          $final_props{$key} = $defaults->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from defaults');
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
       }
    }
 
@@ -1560,7 +1560,7 @@
           grep { $o->has($_) && $o->get($_) }
           keys %{$self->{opts}}
         );
-   MKDEBUG && _d('DSN string made from options:', $dsn_string);
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
    return $self->parse($dsn_string);
 }
 
@@ -1610,7 +1610,7 @@
                      qw(F h P S A))
          . ';mysql_read_default_group=client';
    }
-   MKDEBUG && _d($dsn);
+   PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
 }
 
@@ -1655,7 +1655,7 @@
    my $dbh;
    my $tries = 2;
    while ( !$dbh && $tries-- ) {
-      MKDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
          join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
 
       eval {
@@ -1665,21 +1665,21 @@
             my $sql;
 
             $sql = 'SELECT @@SQL_MODE';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             my ($sql_mode) = $dbh->selectrow_array($sql);
 
             $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
                  . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
                  . ($sql_mode ? ",$sql_mode" : '')
                  . '\'*/';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             $dbh->do($sql);
 
             if ( my ($charset) = $cxn_string =~ m/charset=(\w+)/ ) {
                $sql = "/*!40101 SET NAMES $charset*/";
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
-               MKDEBUG && _d('Enabling charset for STDOUT');
+               PTDEBUG && _d('Enabling charset for STDOUT');
                if ( $charset eq 'utf8' ) {
                   binmode(STDOUT, ':utf8')
                      or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
@@ -1691,15 +1691,15 @@
 
             if ( $self->prop('set-vars') ) {
                $sql = "SET " . $self->prop('set-vars');
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
             }
          }
       };
       if ( !$dbh && $EVAL_ERROR ) {
-         MKDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d($EVAL_ERROR);
          if ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            MKDEBUG && _d('Going to try again without utf8 support');
+            PTDEBUG && _d('Going to try again without utf8 support');
             delete $defaults->{mysql_enable_utf8};
          }
          elsif ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
@@ -1717,7 +1717,7 @@
       }
    }
 
-   MKDEBUG && _d('DBH info: ',
+   PTDEBUG && _d('DBH info: ',
       $dbh,
       Dumper($dbh->selectrow_hashref(
          'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
@@ -1743,7 +1743,7 @@
 
 sub disconnect {
    my ( $self, $dbh ) = @_;
-   MKDEBUG && $self->print_active_handles($dbh);
+   PTDEBUG && $self->print_active_handles($dbh);
    $dbh->disconnect;
 }
 
@@ -1804,7 +1804,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class ) = @_;
@@ -1814,7 +1814,7 @@
 sub parse {
    my ( $self, $str ) = @_;
    my $result = sprintf('%03d%03d%03d', $str =~ m/(\d+)/g);
-   MKDEBUG && _d($str, 'parses to', $result);
+   PTDEBUG && _d($str, 'parses to', $result);
    return $result;
 }
 
@@ -1825,7 +1825,7 @@
          $dbh->selectrow_array('SELECT VERSION()'));
    }
    my $result = $self->{$dbh} ge $self->parse($target) ? 1 : 0;
-   MKDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
+   PTDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
    return $result;
 }
 
@@ -1843,7 +1843,7 @@
       }
       @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
    if ( $innodb ) {
-      MKDEBUG && _d("InnoDB support:", $innodb->{support});
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
       if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
          my $vars = $dbh->selectrow_hashref(
             "SHOW VARIABLES LIKE 'innodb_version'");
@@ -1855,7 +1855,7 @@
       }
    }
 
-   MKDEBUG && _d("InnoDB version:", $innodb_version);
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
    return $innodb_version;
 }
 
@@ -1887,7 +1887,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -1964,7 +1964,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -1993,11 +1993,11 @@
    my @asc_slice;
 
    @asc_cols = @{$tbl_struct->{keys}->{$index}->{cols}};
-   MKDEBUG && _d('Will ascend index', $index);
-   MKDEBUG && _d('Will ascend columns', join(', ', @asc_cols));
+   PTDEBUG && _d('Will ascend index', $index);
+   PTDEBUG && _d('Will ascend columns', join(', ', @asc_cols));
    if ( $args{asc_first} ) {
       @asc_cols = $asc_cols[0];
-      MKDEBUG && _d('Ascending only first column');
+      PTDEBUG && _d('Ascending only first column');
    }
 
    my %col_posn = do { my $i = 0; map { $_ => $i++ } @cols };
@@ -2008,7 +2008,7 @@
       }
       push @asc_slice, $col_posn{$col};
    }
-   MKDEBUG && _d('Will ascend, in ordinal position:', join(', ', @asc_slice));
+   PTDEBUG && _d('Will ascend, in ordinal position:', join(', ', @asc_slice));
 
    my $asc_stmt = {
       cols  => \@cols,
@@ -2129,7 +2129,7 @@
    else {
       @del_cols = @{$tbl->{cols}};
    }
-   MKDEBUG && _d('Columns needed for DELETE:', join(', ', @del_cols));
+   PTDEBUG && _d('Columns needed for DELETE:', join(', ', @del_cols));
 
    my %col_posn = do { my $i = 0; map { $_ => $i++ } @cols };
    foreach my $col ( @del_cols ) {
@@ -2139,7 +2139,7 @@
       }
       push @del_slice, $col_posn{$col};
    }
-   MKDEBUG && _d('Ordinals needed for DELETE:', join(', ', @del_slice));
+   PTDEBUG && _d('Ordinals needed for DELETE:', join(', ', @del_slice));
 
    my $del_stmt = {
       cols  => \@cols,
@@ -2223,7 +2223,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 ( our $before = <<'EOF') =~ s/^   //gm;
    /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -2317,11 +2317,11 @@
 sub _use_db {
    my ( $self, $dbh, $quoter, $new ) = @_;
    if ( !$new ) {
-      MKDEBUG && _d('No new DB to use');
+      PTDEBUG && _d('No new DB to use');
       return;
    }
    my $sql = 'USE ' . $quoter->quote($new);
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
    $dbh->do($sql);
    return;
 }
@@ -2333,12 +2333,12 @@
          . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
          . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
          . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       eval { $dbh->do($sql); };
-      MKDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
+      PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
       $self->_use_db($dbh, $quoter, $db);
       $sql = "SHOW CREATE TABLE " . $quoter->quote($db, $tbl);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $href;
       eval { $href = $dbh->selectrow_hashref($sql); };
       if ( $EVAL_ERROR ) {
@@ -2348,15 +2348,15 @@
 
       $sql = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
          . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       $dbh->do($sql);
       my ($key) = grep { m/create table/i } keys %$href;
       if ( $key ) {
-         MKDEBUG && _d('This table is a base table');
+         PTDEBUG && _d('This table is a base table');
          $self->{tables}->{$db}->{$tbl} = [ 'table', $href->{$key} ];
       }
       else {
-         MKDEBUG && _d('This table is a view');
+         PTDEBUG && _d('This table is a view');
          ($key) = grep { m/create view/i } keys %$href;
          $self->{tables}->{$db}->{$tbl} = [ 'view', $href->{$key} ];
       }
@@ -2366,11 +2366,11 @@
 
 sub get_columns {
    my ( $self, $dbh, $quoter, $db, $tbl ) = @_;
-   MKDEBUG && _d('Get columns for', $db, $tbl);
+   PTDEBUG && _d('Get columns for', $db, $tbl);
    if ( !$self->{cache} || !$self->{columns}->{$db}->{$tbl} ) {
       $self->_use_db($dbh, $quoter, $db);
       my $sql = "SHOW COLUMNS FROM " . $quoter->quote($db, $tbl);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $cols = $dbh->selectall_arrayref($sql, { Slice => {} });
 
       $self->{columns}->{$db}->{$tbl} = [
@@ -2391,7 +2391,7 @@
       map { '  ' . $quoter->quote($_->{field}) . ' ' . $_->{type} }
       @{$self->get_columns($dbh, $quoter, $db, $tbl)});
    $result .= "\n)";
-   MKDEBUG && _d($result);
+   PTDEBUG && _d($result);
    return $result;
 }
 
@@ -2403,11 +2403,11 @@
          . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
          . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
          . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       eval { $dbh->do($sql); };
-      MKDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
+      PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
       $sql = "SHOW TRIGGERS FROM " . $quoter->quote($db);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $sth = $dbh->prepare($sql);
       $sth->execute();
       if ( $sth->rows ) {
@@ -2420,7 +2420,7 @@
       }
       $sql = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
          . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       $dbh->do($sql);
    }
    if ( $tbl ) {
@@ -2439,7 +2439,7 @@
          push @params, $like;
       }
       my $sth = $dbh->prepare($sql);
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       $sth->execute( @params );
       my @dbs = map { $_->[0] } @{$sth->fetchall_arrayref()};
       $self->{databases} = \@dbs unless $like;
@@ -2457,7 +2457,7 @@
          $sql .= ' LIKE ?';
          push @params, $like;
       }
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       my $sth = $dbh->prepare($sql);
       $sth->execute(@params);
       my @tables = @{$sth->fetchall_arrayref({})};
@@ -2483,7 +2483,7 @@
          $sql .= ' LIKE ?';
          push @params, $like;
       }
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       my $sth = $dbh->prepare($sql);
       $sth->execute(@params);
       my @tables = @{$sth->fetchall_arrayref()};
@@ -2528,7 +2528,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
 
@@ -2546,17 +2546,17 @@
 
    check_PID_file(undef, $self->{PID_file});
 
-   MKDEBUG && _d('Daemonized child will log to', $self->{log_file});
+   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
 sub daemonize {
    my ( $self ) = @_;
 
-   MKDEBUG && _d('About to fork and daemonize');
+   PTDEBUG && _d('About to fork and daemonize');
    defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
    if ( $pid ) {
-      MKDEBUG && _d('I am the parent and now I die');
+      PTDEBUG && _d('I am the parent and now I die');
       exit;
    }
 
@@ -2598,19 +2598,19 @@
       }
    }
 
-   MKDEBUG && _d('I am the child and now I live daemonized');
+   PTDEBUG && _d('I am the child and now I live daemonized');
    return;
 }
 
 sub check_PID_file {
    my ( $self, $file ) = @_;
    my $PID_file = $self ? $self->{PID_file} : $file;
-   MKDEBUG && _d('Checking PID file', $PID_file);
+   PTDEBUG && _d('Checking PID file', $PID_file);
    if ( $PID_file && -f $PID_file ) {
       my $pid;
       eval { chomp($pid = `cat $PID_file`); };
       die "Cannot cat $PID_file: $OS_ERROR" if $EVAL_ERROR;
-      MKDEBUG && _d('PID file exists; it contains PID', $pid);
+      PTDEBUG && _d('PID file exists; it contains PID', $pid);
       if ( $pid ) {
          my $pid_is_alive = kill 0, $pid;
          if ( $pid_is_alive ) {
@@ -2628,7 +2628,7 @@
       }
    }
    else {
-      MKDEBUG && _d('No PID file');
+      PTDEBUG && _d('No PID file');
    }
    return;
 }
@@ -2648,7 +2648,7 @@
 
    my $PID_file = $self->{PID_file};
    if ( !$PID_file ) {
-      MKDEBUG && _d('No PID file to create');
+      PTDEBUG && _d('No PID file to create');
       return;
    }
 
@@ -2661,7 +2661,7 @@
    close $PID_FH
       or die "Cannot close PID file $PID_file: $OS_ERROR";
 
-   MKDEBUG && _d('Created PID file:', $self->{PID_file});
+   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
@@ -2670,10 +2670,10 @@
    if ( $self->{PID_file} && -f $self->{PID_file} ) {
       unlink $self->{PID_file}
          or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
-      MKDEBUG && _d('Removed PID file');
+      PTDEBUG && _d('Removed PID file');
    }
    else {
-      MKDEBUG && _d('No PID to remove');
+      PTDEBUG && _d('No PID to remove');
    }
    return;
 }
@@ -2714,7 +2714,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -2735,7 +2735,7 @@
    eval {
       $dbh = $args->{dbh} || $dp->get_dbh(
          $dp->get_cxn_params($dsn), { AutoCommit => 1 });
-      MKDEBUG && _d('Connected to', $dp->as_string($dsn));
+      PTDEBUG && _d('Connected to', $dp->as_string($dsn));
    };
    if ( $EVAL_ERROR ) {
       print STDERR "Cannot connect to ", $dp->as_string($dsn), "\n"
@@ -2744,15 +2744,15 @@
    }
 
    my $sql  = 'SELECT @@SERVER_ID';
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    my ($id) = $dbh->selectrow_array($sql);
-   MKDEBUG && _d('Working on server ID', $id);
+   PTDEBUG && _d('Working on server ID', $id);
    my $master_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
        || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      MKDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what master said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -2768,7 +2768,7 @@
          $self->find_slave_hosts($dp, $dbh, $dsn, $args->{method});
 
       foreach my $slave ( @slaves ) {
-         MKDEBUG && _d('Recursing from',
+         PTDEBUG && _d('Recursing from',
             $dp->as_string($dsn), 'to', $dp->as_string($slave));
          $self->recurse_to_slaves(
             { %$args, dsn => $slave, dbh => undef, parent => $dsn }, $level + 1 );
@@ -2786,23 +2786,23 @@
    }
    else {
       if ( ($dsn->{P} || 3306) != 3306 ) {
-         MKDEBUG && _d('Port number is non-standard; using only hosts method');
+         PTDEBUG && _d('Port number is non-standard; using only hosts method');
          @methods = qw(hosts);
       }
    }
-   MKDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
       'using methods', @methods);
 
    my @slaves;
    METHOD:
    foreach my $method ( @methods ) {
       my $find_slaves = "_find_slaves_by_$method";
-      MKDEBUG && _d('Finding slaves with', $find_slaves);
+      PTDEBUG && _d('Finding slaves with', $find_slaves);
       @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
       last METHOD if @slaves;
    }
 
-   MKDEBUG && _d('Found', scalar(@slaves), 'slaves');
+   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
    return @slaves;
 }
 
@@ -2831,11 +2831,11 @@
 
    my @slaves;
    my $sql = 'SHOW SLAVE HOSTS';
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
    @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
    if ( @slaves ) {
-      MKDEBUG && _d('Found some SHOW SLAVE HOSTS info');
+      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
       @slaves = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
@@ -2864,7 +2864,7 @@
       $user =~ s/([^@]+)@(.+)/'$1'\@'$2'/;
    }
    my $sql = $show . $user;
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
 
    my $proc;
    eval {
@@ -2875,11 +2875,11 @@
    if ( $EVAL_ERROR ) {
 
       if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
-         MKDEBUG && _d('Retrying SHOW GRANTS without host; error:',
+         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
             $EVAL_ERROR);
          ($user) = split('@', $user);
          $sql    = $show . $user;
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          eval {
             $proc = grep {
                m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
@@ -2894,7 +2894,7 @@
    }
 
    $sql = 'SHOW PROCESSLIST';
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
    grep { $_->{command} =~ m/Binlog Dump/i }
    map  { # Lowercase the column names
       my %hash;
@@ -2954,7 +2954,7 @@
    if ( !$self->{not_a_slave}->{$dbh} ) {
       my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
             ||= $dbh->prepare('SHOW SLAVE STATUS');
-      MKDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
       $sth->execute();
       my ($ss) = @{$sth->fetchall_arrayref({})};
 
@@ -2963,7 +2963,7 @@
          return $ss;
       }
 
-      MKDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
+      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
       $self->{not_a_slave}->{$dbh}++;
    }
 }
@@ -2972,21 +2972,21 @@
    my ( $self, $dbh ) = @_;
 
    if ( $self->{not_a_master}->{$dbh} ) {
-      MKDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
       return;
    }
 
    my $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
          ||= $dbh->prepare('SHOW MASTER STATUS');
-   MKDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
-   MKDEBUG && _d(
+   PTDEBUG && _d(
       $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      MKDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
       $self->{not_a_master}->{$dbh}++;
    }
 
@@ -3007,17 +3007,17 @@
    if ( $master_status ) {
       my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', "
               . "$master_status->{position}, $timeout)";
-      MKDEBUG && _d($slave_dbh, $sql);
+      PTDEBUG && _d($slave_dbh, $sql);
       my $start = time;
       ($result) = $slave_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
-      MKDEBUG && _d('Result of waiting:', $result);
-      MKDEBUG && _d("Waited", $waited, "seconds");
+      PTDEBUG && _d('Result of waiting:', $result);
+      PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      MKDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a master');
    }
 
    return {
@@ -3030,7 +3030,7 @@
    my ( $self, $dbh ) = @_;
    my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
          ||= $dbh->prepare('STOP SLAVE');
-   MKDEBUG && _d($dbh, $sth->{Statement});
+   PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
@@ -3039,13 +3039,13 @@
    if ( $pos ) {
       my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
               . "MASTER_LOG_POS=$pos->{position}";
-      MKDEBUG && _d($dbh, $sql);
+      PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
       my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
             ||= $dbh->prepare('START SLAVE');
-      MKDEBUG && _d($dbh, $sth->{Statement});
+      PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
@@ -3058,12 +3058,12 @@
    my $slave_pos     = $self->repl_posn($slave_status);
    my $master_status = $self->get_master_status($master);
    my $master_pos    = $self->repl_posn($master_status);
-   MKDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
+   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
       'Slave position:', $self->pos_to_string($slave_pos));
 
    my $result;
    if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      MKDEBUG && _d('Waiting for slave to catch up to master');
+      PTDEBUG && _d('Waiting for slave to catch up to master');
       $self->start_slave($slave, $master_pos);
 
       $result = $self->wait_for_master(
@@ -3075,7 +3075,7 @@
       if ( !defined $result->{result} ) {
          $slave_status = $self->get_slave_status($slave);
          if ( !$self->slave_is_running($slave_status) ) {
-            MKDEBUG && _d('Master position:',
+            PTDEBUG && _d('Master position:',
                $self->pos_to_string($master_pos),
                'Slave position:', $self->pos_to_string($slave_pos));
             $slave_pos = $self->repl_posn($slave_status);
@@ -3083,7 +3083,7 @@
                die "MASTER_POS_WAIT() returned NULL but slave has not "
                   . "caught up to master";
             }
-            MKDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Slave is caught up to master and stopped');
          }
          else {
             die "Slave has not caught up to master and it is still running";
@@ -3091,7 +3091,7 @@
       }
    }
    else {
-      MKDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Slave is already caught up to master");
    }
 
    return $result;
@@ -3134,7 +3134,7 @@
 sub has_slave_updates {
    my ( $self, $dbh ) = @_;
    my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
 }
@@ -3196,12 +3196,12 @@
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         MKDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Slave replication thread");
          if ( $type ne 'all' ) { 
             my $state = $query->{State} || $query->{state} || '';
 
             if ( $state =~ m/^init|end$/ ) {
-               MKDEBUG && _d("Special state:", $state);
+               PTDEBUG && _d("Special state:", $state);
                $match = 1;
             }
             else {
@@ -3222,7 +3222,7 @@
          }
       }
       else {
-         MKDEBUG && _d('Not system user');
+         PTDEBUG && _d('Not system user');
       }
 
       if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
@@ -3232,14 +3232,14 @@
          }
          else {
             if ( $self->{replication_thread}->{$id} ) {
-               MKDEBUG && _d("Thread ID is a known replication thread ID");
+               PTDEBUG && _d("Thread ID is a known replication thread ID");
                $match = 1;
             }
          }
       }
    }
 
-   MKDEBUG && _d('Matches', $type, 'replication thread:',
+   PTDEBUG && _d('Matches', $type, 'replication thread:',
       ($match ? 'yes' : 'no'), '; match:', $match);
 
    return $match;
@@ -3280,7 +3280,7 @@
       );
 
       my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
-      MKDEBUG && _d($dbh, $sql);
+      PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
       $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
@@ -3334,7 +3334,7 @@
 $Data::Dumper::Indent    = 1;
 $Data::Dumper::Quotekeys = 0;
 
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # Global variables; as few as possible.
 my $oktorun   = 1;
@@ -3505,7 +3505,7 @@
       }
       my $dbh = $dp->get_dbh(
          $dp->get_cxn_params($table), { AutoCommit => $ac });
-      MKDEBUG && _d('Inspecting table on', $dp->as_string($table));
+      PTDEBUG && _d('Inspecting table on', $dp->as_string($table));
 
       # Set options that can enable removing data on the master and archiving it
       # on the slaves.
@@ -3551,7 +3551,7 @@
 
       if ( $o->get('check-charset') ) {
          my $sql = 'SELECT CONCAT(/*!40100 @@session.character_set_connection, */ "")';
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          my ($dbh_charset) =  $table->{dbh}->selectrow_array($sql);
          if ( ($dbh_charset || "") ne ($table->{info}->{charset} || "") ) {
             $src->{dbh}->disconnect() if $src && $src->{dbh};
@@ -3637,7 +3637,7 @@
    my @sel_cols = $o->get('columns')          ? @{$o->get('columns')}    # Explicit
                 : $o->get('primary-key-only') ? @{$src->{info}->{keys}->{PRIMARY}->{cols}} 
                 :                               @{$src->{info}->{cols}}; # All
-   MKDEBUG && _d("sel cols: ", @sel_cols);
+   PTDEBUG && _d("sel cols: ", @sel_cols);
 
    $del_stmt = $nibbler->generate_del_stmt(
       tbl_struct => $src->{info},
@@ -3711,7 +3711,7 @@
       }
    }
 
-   MKDEBUG && _d("Index for DELETE:", $del_stmt->{index});
+   PTDEBUG && _d("Index for DELETE:", $del_stmt->{index});
    if ( !$bulk_del ) {
       # The LIMIT might be 1 here, because even though a SELECT can return
       # many rows, an INSERT only does one at a time.  It would not be safe to
@@ -3726,10 +3726,10 @@
          . " FROM $src->{db_tbl} WHERE $del_stmt->{where}";
 
          if ( $src->{info}->{keys}->{$del_stmt->{index}}->{is_unique} ) {
-            MKDEBUG && _d("DELETE index is unique; LIMIT 1 is not needed");
+            PTDEBUG && _d("DELETE index is unique; LIMIT 1 is not needed");
          }
          else {
-            MKDEBUG && _d("Adding LIMIT 1 to DELETE because DELETE index "
+            PTDEBUG && _d("Adding LIMIT 1 to DELETE because DELETE index "
                . "is not unique");
             $del_sql .= " LIMIT 1";
          }
@@ -3761,7 +3761,7 @@
          ins_tbl  => $dst->{info},
          sel_cols => \@sel_cols,
       );
-      MKDEBUG && _d("inst stmt: ", Dumper($ins_stmt));
+      PTDEBUG && _d("inst stmt: ", Dumper($ins_stmt));
       @ins_slice = @{$ins_stmt->{slice}};
       if ( $o->get('bulk-insert') ) {
          $ins_sql = 'LOAD DATA'
@@ -3788,7 +3788,7 @@
       $ins_sql = '';
    }
 
-   if ( MKDEBUG ) {
+   if ( PTDEBUG ) {
       _d("get first sql:", $first_sql);
       _d("get next sql:", $next_sql);
       _d("del row sql:", $del_sql);
@@ -3857,7 +3857,7 @@
       $statistics{SELECT} += $get_sth->rows;
    });
    my $row = $get_sth->fetchrow_arrayref();
-   MKDEBUG && _d("First row: ", Dumper($row), 'rows:', $get_sth->rows);
+   PTDEBUG && _d("First row: ", Dumper($row), 'rows:', $get_sth->rows);
    if ( !$row ) {
       $get_sth->finish;
       $src->{dbh}->disconnect();
@@ -3945,7 +3945,7 @@
             $ins_sth ||= $ins_row; # Default to the sth decided before.
             my $success = do_with_retries($o, 'inserting', sub {
                $ins_sth->execute(@{$row}[@ins_slice]);
-               MKDEBUG && _d('Inserted', $del_row->rows, 'rows');
+               PTDEBUG && _d('Inserted', $del_row->rows, 'rows');
                $statistics{INSERT} += $ins_sth->rows;
             });
             if ( $success == $OUT_OF_RETRIES ) {
@@ -3968,7 +3968,7 @@
             if ( !$o->get('no-delete') ) {
                my $success = do_with_retries($o, 'deleting', sub {
                   $del_row->execute(@{$row}[@del_slice]);
-                  MKDEBUG && _d('Deleted', $del_row->rows, 'rows');
+                  PTDEBUG && _d('Deleted', $del_row->rows, 'rows');
                   $statistics{DELETE} += $del_row->rows;
                });
                if ( $success == $OUT_OF_RETRIES ) {
@@ -4020,7 +4020,7 @@
          $row = $get_sth->fetchrow_arrayref();
       }
       if ( !$row ) {
-         MKDEBUG && _d('No more rows in this chunk; doing bulk operations');
+         PTDEBUG && _d('No more rows in this chunk; doing bulk operations');
 
          # ###################################################################
          # This code is for the bulk archiving functionality.
@@ -4049,7 +4049,7 @@
             $ins_sth ||= $ins_row; # Default to the sth decided before.
             my $success = do_with_retries($o, 'bulk_inserting', sub {
                $ins_sth->execute($bulkins_file->filename());
-               MKDEBUG && _d('Bulk inserted', $del_row->rows, 'rows');
+               PTDEBUG && _d('Bulk inserted', $del_row->rows, 'rows');
                $statistics{INSERT} += $ins_sth->rows;
             });
             if ( $success != $ALL_IS_WELL ) {
@@ -4073,7 +4073,7 @@
                      @{$first_row}[@bulkdel_slice],
                      @{$lastrow}[@bulkdel_slice],
                   );
-                  MKDEBUG && _d('Bulk deleted', $del_row->rows, 'rows');
+                  PTDEBUG && _d('Bulk deleted', $del_row->rows, 'rows');
                   $statistics{DELETE} += $del_row->rows;
                });
                if ( $success != $ALL_IS_WELL ) {
@@ -4089,12 +4089,12 @@
          commit($o, 1) if $commit_each;
          $get_sth = $get_next;
 
-         MKDEBUG && _d('Fetching rows in next chunk');
+         PTDEBUG && _d('Fetching rows in next chunk');
          trace('select', sub {
             my $select_start = time;
             $get_sth->execute(@{$lastrow}[@asc_slice]);
             $last_select_time = time - $select_start;
-            MKDEBUG && _d('Fetched', $get_sth->rows, 'rows');
+            PTDEBUG && _d('Fetched', $get_sth->rows, 'rows');
             $statistics{SELECT} += $get_sth->rows;
          });
 
@@ -4109,14 +4109,14 @@
          }
       }  # no next row (do bulk operations)
       else {
-         MKDEBUG && _d('Got another row in this chunk');
+         PTDEBUG && _d('Got another row in this chunk');
       }
 
       # Check slave lag and wait if slave is too far behind.
       if ( $lag_dbh ) {
          my $lag = $ms->get_slave_lag($lag_dbh);
          while ( !defined $lag || $lag > $o->get('max-lag') ) {
-            MKDEBUG && _d('Sleeping: slave lag is', $lag);
+            PTDEBUG && _d('Sleeping: slave lag is', $lag);
             sleep($o->get('check-interval'));
             $lag = $ms->get_slave_lag($lag_dbh);
          }
@@ -4126,13 +4126,13 @@
       if( my $sleep_time = $o->get('sleep') ) {
          $sleep_time = $last_select_time * $o->get('sleep-coef')
             if $o->get('sleep-coef');
-         MKDEBUG && _d('Sleeping', $sleep_time);
+         PTDEBUG && _d('Sleeping', $sleep_time);
          trace('sleep', sub {
             sleep($sleep_time);
          });
       }
    }  # ROW 
-   MKDEBUG && _d('Done fetching rows');
+   PTDEBUG && _d('Done fetching rows');
 
    # Transactions might still be open, etc
    commit($o, $txnsize || $commit_each);
@@ -5637,6 +5637,6 @@
 
 =head1 VERSION
 
-pt-archiver 1.0.1
+pt-archiver 1.0.2
 
 =cut

=== modified file 'bin/pt-collect'
--- bin/pt-collect	2011-09-01 16:00:38 +0000
+++ bin/pt-collect	2011-12-29 16:12:24 +0000
@@ -443,7 +443,7 @@
 
 =head1 VERSION
 
-pt-collect 1.0.1
+pt-collect 1.0.2
 
 =cut
 

=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2011-09-01 16:00:38 +0000
+++ bin/pt-config-diff	2011-12-29 16:12:24 +0000
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # ###########################################################################
 # OptionParser package
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 use Getopt::Long;
@@ -106,7 +106,7 @@
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
    if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      MKDEBUG && _d('Parsing DSN OPTIONS');
+      PTDEBUG && _d('Parsing DSN OPTIONS');
       my $dsn_attribs = {
          dsn  => 1,
          copy => 1,
@@ -150,7 +150,7 @@
 
    if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
       $self->{version} = $1;
-      MKDEBUG && _d($self->{version});
+      PTDEBUG && _d($self->{version});
    }
 
    return;
@@ -187,7 +187,7 @@
       chomp $para;
       $para =~ s/\s+/ /g;
       $para =~ s/$POD_link_re/$1/go;
-      MKDEBUG && _d('Option rule:', $para);
+      PTDEBUG && _d('Option rule:', $para);
       push @rules, $para;
    }
 
@@ -196,7 +196,7 @@
    do {
       if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
          chomp $para;
-         MKDEBUG && _d($para);
+         PTDEBUG && _d($para);
          my %attribs;
 
          $para = <$fh>; # read next paragraph, possibly attributes
@@ -215,7 +215,7 @@
             $para = <$fh>; # read next paragraph, probably short help desc
          }
          else {
-            MKDEBUG && _d('Option has no attributes');
+            PTDEBUG && _d('Option has no attributes');
          }
 
          $para =~ s/\s+\Z//g;
@@ -223,7 +223,7 @@
          $para =~ s/$POD_link_re/$1/go;
 
          $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         MKDEBUG && _d('Short help:', $para);
+         PTDEBUG && _d('Short help:', $para);
 
          die "No description after option spec $option" if $para =~ m/^=item/;
 
@@ -261,7 +261,7 @@
 
    foreach my $opt ( @specs ) {
       if ( ref $opt ) { # It's an option spec, not a rule.
-         MKDEBUG && _d('Parsing opt spec:',
+         PTDEBUG && _d('Parsing opt spec:',
             map { ($_, '=>', $opt->{$_}) } keys %$opt);
 
          my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
@@ -274,7 +274,7 @@
          $self->{opts}->{$long} = $opt;
 
          if ( length $long == 1 ) {
-            MKDEBUG && _d('Long opt', $long, 'looks like short opt');
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
             $self->{short_opts}->{$long} = $long;
          }
 
@@ -300,14 +300,14 @@
 
          my ( $type ) = $opt->{spec} =~ m/=(.)/;
          $opt->{type} = $type;
-         MKDEBUG && _d($long, 'type:', $type);
+         PTDEBUG && _d($long, 'type:', $type);
 
 
          $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
 
          if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
             $self->{defaults}->{$long} = defined $def ? $def : 1;
-            MKDEBUG && _d($long, 'default:', $def);
+            PTDEBUG && _d($long, 'default:', $def);
          }
 
          if ( $long eq 'config' ) {
@@ -316,13 +316,13 @@
 
          if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
             $disables{$long} = $dis;
-            MKDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
          }
 
          $self->{opts}->{$long} = $opt;
       }
       else { # It's an option rule, not a spec.
-         MKDEBUG && _d('Parsing rule:', $opt); 
+         PTDEBUG && _d('Parsing rule:', $opt); 
          push @{$self->{rules}}, $opt;
          my @participants = $self->_get_participants($opt);
          my $rule_ok = 0;
@@ -330,17 +330,17 @@
          if ( $opt =~ m/mutually exclusive|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{mutex}}, \@participants;
-            MKDEBUG && _d(@participants, 'are mutually exclusive');
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
          }
          if ( $opt =~ m/at least one|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{atleast1}}, \@participants;
-            MKDEBUG && _d(@participants, 'require at least one');
+            PTDEBUG && _d(@participants, 'require at least one');
          }
          if ( $opt =~ m/default to/ ) {
             $rule_ok = 1;
             $self->{defaults_to}->{$participants[0]} = $participants[1];
-            MKDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
          }
          if ( $opt =~ m/restricted to option groups/ ) {
             $rule_ok = 1;
@@ -354,7 +354,7 @@
          if( $opt =~ m/accepts additional command-line arguments/ ) {
             $rule_ok = 1;
             $self->{strict} = 0;
-            MKDEBUG && _d("Strict mode disabled by rule");
+            PTDEBUG && _d("Strict mode disabled by rule");
          }
 
          die "Unrecognized option rule: $opt" unless $rule_ok;
@@ -364,7 +364,7 @@
    foreach my $long ( keys %disables ) {
       my @participants = $self->_get_participants($disables{$long});
       $self->{disables}->{$long} = \@participants;
-      MKDEBUG && _d('Option', $long, 'disables', @participants);
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
    }
 
    return; 
@@ -378,7 +378,7 @@
          unless exists $self->{opts}->{$long};
       push @participants, $long;
    }
-   MKDEBUG && _d('Participants for', $str, ':', @participants);
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
    return @participants;
 }
 
@@ -401,7 +401,7 @@
       die "Cannot set default for nonexistent option $long"
          unless exists $self->{opts}->{$long};
       $self->{defaults}->{$long} = $defaults{$long};
-      MKDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
    }
    return;
 }
@@ -430,7 +430,7 @@
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
-   MKDEBUG && _d('Got option', $long, '=', $val);
+   PTDEBUG && _d('Got option', $long, '=', $val);
 }
 
 sub get_opts {
@@ -461,7 +461,7 @@
             if ( $self->got('config') ) {
                die $EVAL_ERROR;
             }
-            elsif ( MKDEBUG ) {
+            elsif ( PTDEBUG ) {
                _d($EVAL_ERROR);
             }
          }
@@ -528,7 +528,7 @@
             if ( exists $self->{disables}->{$long} ) {
                my @disable_opts = @{$self->{disables}->{$long}};
                map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               MKDEBUG && _d('Unset options', @disable_opts,
+               PTDEBUG && _d('Unset options', @disable_opts,
                   'because', $long,'disables them');
             }
 
@@ -577,7 +577,7 @@
             delete $long[$i];
          }
          else {
-            MKDEBUG && _d('Temporarily failed to parse', $long);
+            PTDEBUG && _d('Temporarily failed to parse', $long);
          }
       }
 
@@ -601,12 +601,12 @@
    my $val = $opt->{value};
 
    if ( $val && $opt->{type} eq 'm' ) {  # type time
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
       my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
       if ( !$suffix ) {
          my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
          $suffix = $s || 's';
-         MKDEBUG && _d('No suffix given; using', $suffix, 'for',
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
             $opt->{long}, '(value:', $val, ')');
       }
       if ( $suffix =~ m/[smhd]/ ) {
@@ -615,23 +615,23 @@
               : $suffix eq 'h' ? $num * 3600     # Hours
               :                  $num * 86400;   # Days
          $opt->{value} = ($prefix || '') . $val;
-         MKDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
       }
       else {
          $self->save_error("Invalid time suffix for --$opt->{long}");
       }
    }
    elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
       my $prev = {};
       my $from_key = $self->{defaults_to}->{ $opt->{long} };
       if ( $from_key ) {
-         MKDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
          if ( $self->{opts}->{$from_key}->{parsed} ) {
             $prev = $self->{opts}->{$from_key}->{value};
          }
          else {
-            MKDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
                $from_key, 'parsed');
             return;
          }
@@ -640,7 +640,7 @@
       $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
       $self->_parse_size($opt, $val);
    }
    elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
@@ -650,7 +650,7 @@
       $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
    }
    else {
-      MKDEBUG && _d('Nothing to validate for option',
+      PTDEBUG && _d('Nothing to validate for option',
          $opt->{long}, 'type', $opt->{type}, 'value', $val);
    }
 
@@ -724,11 +724,11 @@
    $file ||= $self->{file} || __FILE__;
 
    if ( !$self->{description} || !$self->{usage} ) {
-      MKDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
       my %synop = $self->_parse_synopsis($file);
       $self->{description} ||= $synop{description};
       $self->{usage}       ||= $synop{usage};
-      MKDEBUG && _d("Description:", $self->{description},
+      PTDEBUG && _d("Description:", $self->{description},
          "\nUsage:", $self->{usage});
    }
 
@@ -943,7 +943,7 @@
    my ( $self, $opt, $val ) = @_;
 
    if ( lc($val || '') eq 'null' ) {
-      MKDEBUG && _d('NULL size for', $opt->{long});
+      PTDEBUG && _d('NULL size for', $opt->{long});
       $opt->{value} = 'null';
       return;
    }
@@ -953,7 +953,7 @@
    if ( defined $num ) {
       if ( $factor ) {
          $num *= $factor_for{$factor};
-         MKDEBUG && _d('Setting option', $opt->{y},
+         PTDEBUG && _d('Setting option', $opt->{y},
             'to num', $num, '* factor', $factor);
       }
       $opt->{value} = ($pre || '') . $num;
@@ -977,7 +977,7 @@
 sub _parse_synopsis {
    my ( $self, $file ) = @_;
    $file ||= $self->{file} || __FILE__;
-   MKDEBUG && _d("Parsing SYNOPSIS in", $file);
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
 
    local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
    open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
@@ -990,7 +990,7 @@
       push @synop, $para;
    }
    close $fh;
-   MKDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
    my ($usage, $desc) = @synop;
    die "The SYNOPSIS section in $file is not formatted properly"
       unless $usage && $desc;
@@ -1017,7 +1017,7 @@
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
-if ( MKDEBUG ) {
+if ( PTDEBUG ) {
    print '# ', $^X, ' ', $], "\n";
    if ( my $uname = `uname -a` ) {
       $uname =~ s/\s+/ /g;
@@ -1047,7 +1047,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 0;
@@ -1070,7 +1070,7 @@
       if ( !$opt->{key} || !$opt->{desc} ) {
          die "Invalid DSN option: ", Dumper($opt);
       }
-      MKDEBUG && _d('DSN option:',
+      PTDEBUG && _d('DSN option:',
          join(', ',
             map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
                keys %$opt
@@ -1088,7 +1088,7 @@
 sub prop {
    my ( $self, $prop, $value ) = @_;
    if ( @_ > 2 ) {
-      MKDEBUG && _d('Setting', $prop, 'property');
+      PTDEBUG && _d('Setting', $prop, 'property');
       $self->{$prop} = $value;
    }
    return $self->{$prop};
@@ -1097,10 +1097,10 @@
 sub parse {
    my ( $self, $dsn, $prev, $defaults ) = @_;
    if ( !$dsn ) {
-      MKDEBUG && _d('No DSN to parse');
+      PTDEBUG && _d('No DSN to parse');
       return;
    }
-   MKDEBUG && _d('Parsing', $dsn);
+   PTDEBUG && _d('Parsing', $dsn);
    $prev     ||= {};
    $defaults ||= {};
    my %given_props;
@@ -1112,23 +1112,23 @@
          $given_props{$prop_key} = $prop_val;
       }
       else {
-         MKDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
          $given_props{h} = $dsn_part;
       }
    }
 
    foreach my $key ( keys %$opts ) {
-      MKDEBUG && _d('Finding value for', $key);
+      PTDEBUG && _d('Finding value for', $key);
       $final_props{$key} = $given_props{$key};
       if (   !defined $final_props{$key}
            && defined $prev->{$key} && $opts->{$key}->{copy} )
       {
          $final_props{$key} = $prev->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from previous DSN');
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
       }
       if ( !defined $final_props{$key} ) {
          $final_props{$key} = $defaults->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from defaults');
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
       }
    }
 
@@ -1159,7 +1159,7 @@
           grep { $o->has($_) && $o->get($_) }
           keys %{$self->{opts}}
         );
-   MKDEBUG && _d('DSN string made from options:', $dsn_string);
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
    return $self->parse($dsn_string);
 }
 
@@ -1209,7 +1209,7 @@
                      qw(F h P S A))
          . ';mysql_read_default_group=client';
    }
-   MKDEBUG && _d($dsn);
+   PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
 }
 
@@ -1254,7 +1254,7 @@
    my $dbh;
    my $tries = 2;
    while ( !$dbh && $tries-- ) {
-      MKDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
          join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
 
       eval {
@@ -1264,21 +1264,21 @@
             my $sql;
 
             $sql = 'SELECT @@SQL_MODE';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             my ($sql_mode) = $dbh->selectrow_array($sql);
 
             $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
                  . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
                  . ($sql_mode ? ",$sql_mode" : '')
                  . '\'*/';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             $dbh->do($sql);
 
             if ( my ($charset) = $cxn_string =~ m/charset=(\w+)/ ) {
                $sql = "/*!40101 SET NAMES $charset*/";
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
-               MKDEBUG && _d('Enabling charset for STDOUT');
+               PTDEBUG && _d('Enabling charset for STDOUT');
                if ( $charset eq 'utf8' ) {
                   binmode(STDOUT, ':utf8')
                      or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
@@ -1290,15 +1290,15 @@
 
             if ( $self->prop('set-vars') ) {
                $sql = "SET " . $self->prop('set-vars');
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
             }
          }
       };
       if ( !$dbh && $EVAL_ERROR ) {
-         MKDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d($EVAL_ERROR);
          if ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            MKDEBUG && _d('Going to try again without utf8 support');
+            PTDEBUG && _d('Going to try again without utf8 support');
             delete $defaults->{mysql_enable_utf8};
          }
          elsif ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
@@ -1316,7 +1316,7 @@
       }
    }
 
-   MKDEBUG && _d('DBH info: ',
+   PTDEBUG && _d('DBH info: ',
       $dbh,
       Dumper($dbh->selectrow_hashref(
          'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
@@ -1342,7 +1342,7 @@
 
 sub disconnect {
    my ( $self, $dbh ) = @_;
-   MKDEBUG && $self->print_active_handles($dbh);
+   PTDEBUG && $self->print_active_handles($dbh);
    $dbh->disconnect;
 }
 
@@ -1403,7 +1403,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
 
@@ -1421,17 +1421,17 @@
 
    check_PID_file(undef, $self->{PID_file});
 
-   MKDEBUG && _d('Daemonized child will log to', $self->{log_file});
+   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
 sub daemonize {
    my ( $self ) = @_;
 
-   MKDEBUG && _d('About to fork and daemonize');
+   PTDEBUG && _d('About to fork and daemonize');
    defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
    if ( $pid ) {
-      MKDEBUG && _d('I am the parent and now I die');
+      PTDEBUG && _d('I am the parent and now I die');
       exit;
    }
 
@@ -1473,19 +1473,19 @@
       }
    }
 
-   MKDEBUG && _d('I am the child and now I live daemonized');
+   PTDEBUG && _d('I am the child and now I live daemonized');
    return;
 }
 
 sub check_PID_file {
    my ( $self, $file ) = @_;
    my $PID_file = $self ? $self->{PID_file} : $file;
-   MKDEBUG && _d('Checking PID file', $PID_file);
+   PTDEBUG && _d('Checking PID file', $PID_file);
    if ( $PID_file && -f $PID_file ) {
       my $pid;
       eval { chomp($pid = `cat $PID_file`); };
       die "Cannot cat $PID_file: $OS_ERROR" if $EVAL_ERROR;
-      MKDEBUG && _d('PID file exists; it contains PID', $pid);
+      PTDEBUG && _d('PID file exists; it contains PID', $pid);
       if ( $pid ) {
          my $pid_is_alive = kill 0, $pid;
          if ( $pid_is_alive ) {
@@ -1503,7 +1503,7 @@
       }
    }
    else {
-      MKDEBUG && _d('No PID file');
+      PTDEBUG && _d('No PID file');
    }
    return;
 }
@@ -1523,7 +1523,7 @@
 
    my $PID_file = $self->{PID_file};
    if ( !$PID_file ) {
-      MKDEBUG && _d('No PID file to create');
+      PTDEBUG && _d('No PID file to create');
       return;
    }
 
@@ -1536,7 +1536,7 @@
    close $PID_FH
       or die "Cannot close PID file $PID_file: $OS_ERROR";
 
-   MKDEBUG && _d('Created PID file:', $self->{PID_file});
+   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
@@ -1545,10 +1545,10 @@
    if ( $self->{PID_file} && -f $self->{PID_file} ) {
       unlink $self->{PID_file}
          or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
-      MKDEBUG && _d('Removed PID file');
+      PTDEBUG && _d('Removed PID file');
    }
    else {
-      MKDEBUG && _d('No PID to remove');
+      PTDEBUG && _d('No PID to remove');
    }
    return;
 }
@@ -1589,7 +1589,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -1642,19 +1642,19 @@
    my $result_set;
 
    if ( $text =~ m/^\+---/m ) { # standard "tabular" output
-      MKDEBUG && _d('Result set text is standard tabular');
+      PTDEBUG && _d('Result set text is standard tabular');
       my $line_pattern  = qr/^(\| .*)[\r\n]+/m;
       $result_set
          = $self->parse_horizontal_row($text, $line_pattern, \&_parse_tabular);
    }
    elsif ( $text =~ m/^\w+\t\w+/m ) { # tab-separated
-      MKDEBUG && _d('Result set text is tab-separated');
+      PTDEBUG && _d('Result set text is tab-separated');
       my $line_pattern  = qr/^(.*?\t.*)[\r\n]+/m;
       $result_set
          = $self->parse_horizontal_row($text, $line_pattern, \&_parse_tab_sep);
    }
    elsif ( $text =~ m/\*\*\* \d+\. row/ ) { # "vertical" output
-      MKDEBUG && _d('Result set text is vertical (\G)');
+      PTDEBUG && _d('Result set text is vertical (\G)');
       foreach my $row ( split_vertical_rows($text) ) {
          push @$result_set, $self->parse_vertical_row($row);
       }
@@ -1733,7 +1733,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 my %can_be_duplicate = (
    replicate_wild_do_table     => 1,
@@ -1791,7 +1791,7 @@
    elsif ( my $dbh = $args{dbh} ) {
       $config_data{format} = $args{format} || 'show_variables';
       my $sql = "SHOW /*!40103 GLOBAL*/ VARIABLES";
-      MKDEBUG && _d($dbh, $sql);
+      PTDEBUG && _d($dbh, $sql);
       my $rows = $dbh->selectall_arrayref($sql);
       $config_data{vars} = { map { @$_ } @$rows };
       $config_data{mysql_version} = _get_version($dbh);
@@ -1810,7 +1810,7 @@
       die "I need a $arg arugment" unless $args{$arg};
    }
    my ($output) = @args{@required_args};
-   MKDEBUG && _d("Parsing config output");
+   PTDEBUG && _d("Parsing config output");
 
    my $format = $args{format} || detect_config_output_format(%args);
    if ( !$format ) {
@@ -1868,22 +1868,22 @@
         || $output =~ m/Variable_name:\s+\w+/
         || $output =~ m/Variable_name\s+Value$/m )
    {
-      MKDEBUG && _d('show variables format');
+      PTDEBUG && _d('show variables format');
       $format = 'show_variables';
    }
    elsif (    $output =~ m/Starts the MySQL database server/
            || $output =~ m/Default options are read from /
            || $output =~ m/^help\s+TRUE /m )
    {
-      MKDEBUG && _d('mysqld format');
+      PTDEBUG && _d('mysqld format');
       $format = 'mysqld';
    }
    elsif ( $output =~ m/^--\w+/m ) {
-      MKDEBUG && _d('my_print_defaults format');
+      PTDEBUG && _d('my_print_defaults format');
       $format = 'my_print_defaults';
    }
    elsif ( $output =~ m/^\s*\[[a-zA-Z]+\]\s*$/m ) {
-      MKDEBUG && _d('option file format');
+      PTDEBUG && _d('option file format');
       $format = 'option_file',
    }
 
@@ -1918,14 +1918,14 @@
       my ($opt_files) = $output =~ m/\G^(.+)\n/m;
       my %seen;
       my @opt_files = grep { !$seen{$_} } split(' ', $opt_files);
-      MKDEBUG && _d('Option files:', @opt_files);
+      PTDEBUG && _d('Option files:', @opt_files);
    }
    else {
-      MKDEBUG && _d("mysqld help output doesn't list option files");
+      PTDEBUG && _d("mysqld help output doesn't list option files");
    }
 
    if ( $output !~ m/^-+ -+$/mg ) {
-      MKDEBUG && _d("mysqld help output doesn't list vars and vals");
+      PTDEBUG && _d("mysqld help output doesn't list vars and vals");
       return;
    }
 
@@ -1996,13 +1996,13 @@
          $var =~ s/-/_/g;
 
          if ( exists $config{$var} && !$can_be_duplicate{$var} ) {
-            MKDEBUG && _d("Duplicate var:", $var);
+            PTDEBUG && _d("Duplicate var:", $var);
             $duplicate_var = 1;  # flag on, save all the var's values
          }
       }
       else {
          my $val = $item;
-         MKDEBUG && _d("Var:", $var, "val:", $val);
+         PTDEBUG && _d("Var:", $var, "val:", $val);
 
          if ( !defined $val ) {
             $val = '';
@@ -2063,7 +2063,7 @@
 sub _slurp_file {
    my ( $file ) = @_;
    die "I need a file argument" unless $file;
-   MKDEBUG && _d("Reading", $file);
+   PTDEBUG && _d("Reading", $file);
    open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
@@ -2075,7 +2075,7 @@
    return unless $dbh;
    my $version = $dbh->selectrow_arrayref('SELECT VERSION()')->[0];
    $version =~ s/(\d\.\d{1,2}.\d{1,2})/$1/;
-   MKDEBUG && _d('MySQL version', $version);
+   PTDEBUG && _d('MySQL version', $version);
    return $version;
 }
 
@@ -2149,7 +2149,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 my %alt_val_for = (
    ON    => 1,
@@ -2233,7 +2233,7 @@
    my ($configs) = @args{@required_args};
 
    if ( @$configs < 2 ) {
-      MKDEBUG && _d("Less than two MySQLConfig objects; nothing to compare");
+      PTDEBUG && _d("Less than two MySQLConfig objects; nothing to compare");
       return;
    }
 
@@ -2281,7 +2281,7 @@
                }
             }
 
-            MKDEBUG && _d("Different", $var, "values:", $val0, $valN);
+            PTDEBUG && _d("Different", $var, "values:", $val0, $valN);
             $diffs->{$var} = [ map { $_->value_of($var) } @$configs ];
             last CONFIG;
          }  # CONFIG
@@ -2308,7 +2308,7 @@
    my ($configs) = @args{@required_args};
 
    if ( @$configs < 2 ) {
-      MKDEBUG && _d("Less than two MySQLConfig objects; nothing to compare");
+      PTDEBUG && _d("Less than two MySQLConfig objects; nothing to compare");
       return;
    }
 
@@ -2387,7 +2387,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(min max);
 use POSIX qw(ceil);
@@ -2420,7 +2420,7 @@
          . "is not installed" unless $have_term;
       ($self->{line_width}) = GetTerminalSize();
    }
-   MKDEBUG && _d('Line width:', $self->{line_width});
+   PTDEBUG && _d('Line width:', $self->{line_width});
 
    return bless $self, $class;
 }
@@ -2445,7 +2445,7 @@
 
       if ( $col->{width} ) {
          $col->{width_pct} = ceil(($col->{width} * 100) / $self->{line_width});
-         MKDEBUG && _d('col:', $col_name, 'width:', $col->{width}, 'chars =',
+         PTDEBUG && _d('col:', $col_name, 'width:', $col->{width}, 'chars =',
             $col->{width_pct}, '%');
       }
 
@@ -2453,7 +2453,7 @@
          $used_width += $col->{width_pct};
       }
       else {
-         MKDEBUG && _d('Auto width col:', $col_name);
+         PTDEBUG && _d('Auto width col:', $col_name);
          $col->{auto_width} = 1;
          push @auto_width_cols, $i;
       }
@@ -2482,15 +2482,15 @@
 
    if ( @auto_width_cols ) {
       my $wid_per_col = int((100 - $used_width) / scalar @auto_width_cols);
-      MKDEBUG && _d('Line width left:', (100-$used_width), '%;',
+      PTDEBUG && _d('Line width left:', (100-$used_width), '%;',
          'each auto width col:', $wid_per_col, '%');
       map { $self->{cols}->[$_]->{width_pct} = $wid_per_col } @auto_width_cols;
    }
 
    $min_hdr_wid += ($self->{n_cols} - 1) * length $self->{column_spacing};
-   MKDEBUG && _d('min header width:', $min_hdr_wid);
+   PTDEBUG && _d('min header width:', $min_hdr_wid);
    if ( $min_hdr_wid > $self->{line_width} ) {
-      MKDEBUG && _d('Will truncate headers because min header width',
+      PTDEBUG && _d('Will truncate headers because min header width',
          $min_hdr_wid, '> line width', $self->{line_width});
       $self->{truncate_headers} = 1;
    }
@@ -2531,7 +2531,7 @@
    my @col_fmts = $self->_make_column_formats();
    my $fmt      = ($self->{line_prefix} || '')
                 . join($self->{column_spacing}, @col_fmts);
-   MKDEBUG && _d('Format:', $fmt);
+   PTDEBUG && _d('Format:', $fmt);
 
    (my $hdr_fmt = $fmt) =~ s/%([^-])/%-$1/g;
 
@@ -2583,7 +2583,7 @@
       $val = $mark . substr($val, -1 * $width + length $mark);
    }
    else {
-      MKDEBUG && _d("I don't know how to", $side, "truncate values");
+      PTDEBUG && _d("I don't know how to", $side, "truncate values");
    }
    return $val;
 }
@@ -2595,27 +2595,27 @@
    foreach my $col ( @{$self->{cols}} ) {
       my $print_width = int($self->{line_width} * ($col->{width_pct} / 100));
 
-      MKDEBUG && _d('col:', $col->{name}, 'width pct:', $col->{width_pct},
+      PTDEBUG && _d('col:', $col->{name}, 'width pct:', $col->{width_pct},
          'char width:', $print_width,
          'min val:', $col->{min_val}, 'max val:', $col->{max_val});
 
       if ( $col->{auto_width} ) {
          if ( $col->{min_val} && $print_width < $col->{min_val} ) {
-            MKDEBUG && _d('Increased to min val width:', $col->{min_val});
+            PTDEBUG && _d('Increased to min val width:', $col->{min_val});
             $print_width = $col->{min_val};
          }
          elsif ( $col->{max_val} &&  $print_width > $col->{max_val} ) {
-            MKDEBUG && _d('Reduced to max val width:', $col->{max_val});
+            PTDEBUG && _d('Reduced to max val width:', $col->{max_val});
             $extra_space += $print_width - $col->{max_val};
             $print_width  = $col->{max_val};
          }
       }
 
       $col->{print_width} = $print_width;
-      MKDEBUG && _d('print width:', $col->{print_width});
+      PTDEBUG && _d('print width:', $col->{print_width});
    }
 
-   MKDEBUG && _d('Extra space:', $extra_space);
+   PTDEBUG && _d('Extra space:', $extra_space);
    while ( $extra_space-- ) {
       foreach my $col ( @{$self->{cols}} ) {
          if (    $col->{auto_width}
@@ -2638,7 +2638,7 @@
       my $print_width = $col->{print_width};
       next if length $col_name <= $print_width;
       $col->{name}  = $self->truncate_value($col, $col_name, $print_width, $side);
-      MKDEBUG && _d('Truncated hdr', $col_name, 'to', $col->{name},
+      PTDEBUG && _d('Truncated hdr', $col_name, 'to', $col->{name},
          'max width:', $print_width);
    }
    return;
@@ -2663,7 +2663,7 @@
             my $print_width = $col->{print_width};
             $val = $callback ? $callback->($col, $val, $print_width)
                  :             $self->truncate_value($col, $val, $print_width);
-            MKDEBUG && _d('Truncated val', $vals->[$i], 'to', $val,
+            PTDEBUG && _d('Truncated val', $vals->[$i], 'to', $val,
                '; max width:', $print_width);
             $vals->[$i] = $val;
          }
@@ -2741,7 +2741,7 @@
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub main {
    @ARGV = @_;  # set global ARGV for this package
@@ -2787,7 +2787,7 @@
    my @config_names;  # Human-readable names for those ^ objs
    foreach my $config_src ( @ARGV ) {
       if ( -f $config_src ) {
-         MKDEBUG && _d('Config source', $config_src, 'is a file');
+         PTDEBUG && _d('Config source', $config_src, 'is a file');
          push @configs, new MySQLConfig(
             file => $config_src,
             %common_modules,
@@ -2795,7 +2795,7 @@
          push @config_names, $config_src;  # filename
       }
       else {
-         MKDEBUG && _d('Config source', $config_src, 'is a DSN');
+         PTDEBUG && _d('Config source', $config_src, 'is a DSN');
          my $dsn = $dp->parse($config_src, $last_dsn, $dsn_defaults);
          my $dbh = $dp->get_dbh($dp->get_cxn_params($dsn), {AutoCommit => 1});
          $dp->fill_in_dsn($dbh, $dsn);
@@ -2818,7 +2818,7 @@
    if ( $o->get('daemonize') ) {
       $daemon = new Daemon(o=>$o);
       $daemon->daemonize();
-      MKDEBUG && _d('I am a daemon now');
+      PTDEBUG && _d('I am a daemon now');
    }
    elsif ( $o->get('pid') ) {
       # We're not daemoninzing, it just handles PID stuff.
@@ -2850,10 +2850,10 @@
       # };
    }
 
-   MKDEBUG && _d("Comparing", scalar @configs, "configs");
+   PTDEBUG && _d("Comparing", scalar @configs, "configs");
    my $diffs   = $config_cmp->diff(configs=>\@configs);
    my $n_diffs = scalar keys %$diffs;
-   MKDEBUG && _d($n_diffs, "differences found:", Dumper($diffs));
+   PTDEBUG && _d($n_diffs, "differences found:", Dumper($diffs));
    if ( $n_diffs ) {
       if ( $o->get('report') ) {
          foreach my $var ( sort keys %$diffs ) {
@@ -3257,6 +3257,6 @@
 
 =head1 VERSION
 
-pt-config-diff 1.0.1
+pt-config-diff 1.0.2
 
 =cut

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2011-09-01 16:00:38 +0000
+++ bin/pt-deadlock-logger	2011-12-29 16:12:24 +0000
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # ###########################################################################
 # OptionParser package
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 use Getopt::Long;
@@ -106,7 +106,7 @@
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
    if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      MKDEBUG && _d('Parsing DSN OPTIONS');
+      PTDEBUG && _d('Parsing DSN OPTIONS');
       my $dsn_attribs = {
          dsn  => 1,
          copy => 1,
@@ -150,7 +150,7 @@
 
    if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
       $self->{version} = $1;
-      MKDEBUG && _d($self->{version});
+      PTDEBUG && _d($self->{version});
    }
 
    return;
@@ -187,7 +187,7 @@
       chomp $para;
       $para =~ s/\s+/ /g;
       $para =~ s/$POD_link_re/$1/go;
-      MKDEBUG && _d('Option rule:', $para);
+      PTDEBUG && _d('Option rule:', $para);
       push @rules, $para;
    }
 
@@ -196,7 +196,7 @@
    do {
       if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
          chomp $para;
-         MKDEBUG && _d($para);
+         PTDEBUG && _d($para);
          my %attribs;
 
          $para = <$fh>; # read next paragraph, possibly attributes
@@ -215,7 +215,7 @@
             $para = <$fh>; # read next paragraph, probably short help desc
          }
          else {
-            MKDEBUG && _d('Option has no attributes');
+            PTDEBUG && _d('Option has no attributes');
          }
 
          $para =~ s/\s+\Z//g;
@@ -223,7 +223,7 @@
          $para =~ s/$POD_link_re/$1/go;
 
          $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         MKDEBUG && _d('Short help:', $para);
+         PTDEBUG && _d('Short help:', $para);
 
          die "No description after option spec $option" if $para =~ m/^=item/;
 
@@ -261,7 +261,7 @@
 
    foreach my $opt ( @specs ) {
       if ( ref $opt ) { # It's an option spec, not a rule.
-         MKDEBUG && _d('Parsing opt spec:',
+         PTDEBUG && _d('Parsing opt spec:',
             map { ($_, '=>', $opt->{$_}) } keys %$opt);
 
          my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
@@ -274,7 +274,7 @@
          $self->{opts}->{$long} = $opt;
 
          if ( length $long == 1 ) {
-            MKDEBUG && _d('Long opt', $long, 'looks like short opt');
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
             $self->{short_opts}->{$long} = $long;
          }
 
@@ -300,14 +300,14 @@
 
          my ( $type ) = $opt->{spec} =~ m/=(.)/;
          $opt->{type} = $type;
-         MKDEBUG && _d($long, 'type:', $type);
+         PTDEBUG && _d($long, 'type:', $type);
 
 
          $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
 
          if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
             $self->{defaults}->{$long} = defined $def ? $def : 1;
-            MKDEBUG && _d($long, 'default:', $def);
+            PTDEBUG && _d($long, 'default:', $def);
          }
 
          if ( $long eq 'config' ) {
@@ -316,13 +316,13 @@
 
          if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
             $disables{$long} = $dis;
-            MKDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
          }
 
          $self->{opts}->{$long} = $opt;
       }
       else { # It's an option rule, not a spec.
-         MKDEBUG && _d('Parsing rule:', $opt); 
+         PTDEBUG && _d('Parsing rule:', $opt); 
          push @{$self->{rules}}, $opt;
          my @participants = $self->_get_participants($opt);
          my $rule_ok = 0;
@@ -330,17 +330,17 @@
          if ( $opt =~ m/mutually exclusive|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{mutex}}, \@participants;
-            MKDEBUG && _d(@participants, 'are mutually exclusive');
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
          }
          if ( $opt =~ m/at least one|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{atleast1}}, \@participants;
-            MKDEBUG && _d(@participants, 'require at least one');
+            PTDEBUG && _d(@participants, 'require at least one');
          }
          if ( $opt =~ m/default to/ ) {
             $rule_ok = 1;
             $self->{defaults_to}->{$participants[0]} = $participants[1];
-            MKDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
          }
          if ( $opt =~ m/restricted to option groups/ ) {
             $rule_ok = 1;
@@ -354,7 +354,7 @@
          if( $opt =~ m/accepts additional command-line arguments/ ) {
             $rule_ok = 1;
             $self->{strict} = 0;
-            MKDEBUG && _d("Strict mode disabled by rule");
+            PTDEBUG && _d("Strict mode disabled by rule");
          }
 
          die "Unrecognized option rule: $opt" unless $rule_ok;
@@ -364,7 +364,7 @@
    foreach my $long ( keys %disables ) {
       my @participants = $self->_get_participants($disables{$long});
       $self->{disables}->{$long} = \@participants;
-      MKDEBUG && _d('Option', $long, 'disables', @participants);
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
    }
 
    return; 
@@ -378,7 +378,7 @@
          unless exists $self->{opts}->{$long};
       push @participants, $long;
    }
-   MKDEBUG && _d('Participants for', $str, ':', @participants);
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
    return @participants;
 }
 
@@ -401,7 +401,7 @@
       die "Cannot set default for nonexistent option $long"
          unless exists $self->{opts}->{$long};
       $self->{defaults}->{$long} = $defaults{$long};
-      MKDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
    }
    return;
 }
@@ -430,7 +430,7 @@
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
-   MKDEBUG && _d('Got option', $long, '=', $val);
+   PTDEBUG && _d('Got option', $long, '=', $val);
 }
 
 sub get_opts {
@@ -461,7 +461,7 @@
             if ( $self->got('config') ) {
                die $EVAL_ERROR;
             }
-            elsif ( MKDEBUG ) {
+            elsif ( PTDEBUG ) {
                _d($EVAL_ERROR);
             }
          }
@@ -528,7 +528,7 @@
             if ( exists $self->{disables}->{$long} ) {
                my @disable_opts = @{$self->{disables}->{$long}};
                map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               MKDEBUG && _d('Unset options', @disable_opts,
+               PTDEBUG && _d('Unset options', @disable_opts,
                   'because', $long,'disables them');
             }
 
@@ -577,7 +577,7 @@
             delete $long[$i];
          }
          else {
-            MKDEBUG && _d('Temporarily failed to parse', $long);
+            PTDEBUG && _d('Temporarily failed to parse', $long);
          }
       }
 
@@ -601,12 +601,12 @@
    my $val = $opt->{value};
 
    if ( $val && $opt->{type} eq 'm' ) {  # type time
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
       my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
       if ( !$suffix ) {
          my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
          $suffix = $s || 's';
-         MKDEBUG && _d('No suffix given; using', $suffix, 'for',
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
             $opt->{long}, '(value:', $val, ')');
       }
       if ( $suffix =~ m/[smhd]/ ) {
@@ -615,23 +615,23 @@
               : $suffix eq 'h' ? $num * 3600     # Hours
               :                  $num * 86400;   # Days
          $opt->{value} = ($prefix || '') . $val;
-         MKDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
       }
       else {
          $self->save_error("Invalid time suffix for --$opt->{long}");
       }
    }
    elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
       my $prev = {};
       my $from_key = $self->{defaults_to}->{ $opt->{long} };
       if ( $from_key ) {
-         MKDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
          if ( $self->{opts}->{$from_key}->{parsed} ) {
             $prev = $self->{opts}->{$from_key}->{value};
          }
          else {
-            MKDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
                $from_key, 'parsed');
             return;
          }
@@ -640,7 +640,7 @@
       $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
       $self->_parse_size($opt, $val);
    }
    elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
@@ -650,7 +650,7 @@
       $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
    }
    else {
-      MKDEBUG && _d('Nothing to validate for option',
+      PTDEBUG && _d('Nothing to validate for option',
          $opt->{long}, 'type', $opt->{type}, 'value', $val);
    }
 
@@ -724,11 +724,11 @@
    $file ||= $self->{file} || __FILE__;
 
    if ( !$self->{description} || !$self->{usage} ) {
-      MKDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
       my %synop = $self->_parse_synopsis($file);
       $self->{description} ||= $synop{description};
       $self->{usage}       ||= $synop{usage};
-      MKDEBUG && _d("Description:", $self->{description},
+      PTDEBUG && _d("Description:", $self->{description},
          "\nUsage:", $self->{usage});
    }
 
@@ -943,7 +943,7 @@
    my ( $self, $opt, $val ) = @_;
 
    if ( lc($val || '') eq 'null' ) {
-      MKDEBUG && _d('NULL size for', $opt->{long});
+      PTDEBUG && _d('NULL size for', $opt->{long});
       $opt->{value} = 'null';
       return;
    }
@@ -953,7 +953,7 @@
    if ( defined $num ) {
       if ( $factor ) {
          $num *= $factor_for{$factor};
-         MKDEBUG && _d('Setting option', $opt->{y},
+         PTDEBUG && _d('Setting option', $opt->{y},
             'to num', $num, '* factor', $factor);
       }
       $opt->{value} = ($pre || '') . $num;
@@ -977,7 +977,7 @@
 sub _parse_synopsis {
    my ( $self, $file ) = @_;
    $file ||= $self->{file} || __FILE__;
-   MKDEBUG && _d("Parsing SYNOPSIS in", $file);
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
 
    local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
    open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
@@ -990,7 +990,7 @@
       push @synop, $para;
    }
    close $fh;
-   MKDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
    my ($usage, $desc) = @synop;
    die "The SYNOPSIS section in $file is not formatted properly"
       unless $usage && $desc;
@@ -1017,7 +1017,7 @@
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
-if ( MKDEBUG ) {
+if ( PTDEBUG ) {
    print '# ', $^X, ' ', $], "\n";
    if ( my $uname = `uname -a` ) {
       $uname =~ s/\s+/ /g;
@@ -1047,7 +1047,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class ) = @_;
@@ -1057,7 +1057,7 @@
 sub parse {
    my ( $self, $str ) = @_;
    my $result = sprintf('%03d%03d%03d', $str =~ m/(\d+)/g);
-   MKDEBUG && _d($str, 'parses to', $result);
+   PTDEBUG && _d($str, 'parses to', $result);
    return $result;
 }
 
@@ -1068,7 +1068,7 @@
          $dbh->selectrow_array('SELECT VERSION()'));
    }
    my $result = $self->{$dbh} ge $self->parse($target) ? 1 : 0;
-   MKDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
+   PTDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
    return $result;
 }
 
@@ -1086,7 +1086,7 @@
       }
       @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
    if ( $innodb ) {
-      MKDEBUG && _d("InnoDB support:", $innodb->{support});
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
       if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
          my $vars = $dbh->selectrow_hashref(
             "SHOW VARIABLES LIKE 'innodb_version'");
@@ -1098,7 +1098,7 @@
       }
    }
 
-   MKDEBUG && _d("InnoDB version:", $innodb_version);
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
    return $innodb_version;
 }
 
@@ -1130,7 +1130,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -1207,7 +1207,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 0;
@@ -1230,7 +1230,7 @@
       if ( !$opt->{key} || !$opt->{desc} ) {
          die "Invalid DSN option: ", Dumper($opt);
       }
-      MKDEBUG && _d('DSN option:',
+      PTDEBUG && _d('DSN option:',
          join(', ',
             map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
                keys %$opt
@@ -1248,7 +1248,7 @@
 sub prop {
    my ( $self, $prop, $value ) = @_;
    if ( @_ > 2 ) {
-      MKDEBUG && _d('Setting', $prop, 'property');
+      PTDEBUG && _d('Setting', $prop, 'property');
       $self->{$prop} = $value;
    }
    return $self->{$prop};
@@ -1257,10 +1257,10 @@
 sub parse {
    my ( $self, $dsn, $prev, $defaults ) = @_;
    if ( !$dsn ) {
-      MKDEBUG && _d('No DSN to parse');
+      PTDEBUG && _d('No DSN to parse');
       return;
    }
-   MKDEBUG && _d('Parsing', $dsn);
+   PTDEBUG && _d('Parsing', $dsn);
    $prev     ||= {};
    $defaults ||= {};
    my %given_props;
@@ -1272,23 +1272,23 @@
          $given_props{$prop_key} = $prop_val;
       }
       else {
-         MKDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
          $given_props{h} = $dsn_part;
       }
    }
 
    foreach my $key ( keys %$opts ) {
-      MKDEBUG && _d('Finding value for', $key);
+      PTDEBUG && _d('Finding value for', $key);
       $final_props{$key} = $given_props{$key};
       if (   !defined $final_props{$key}
            && defined $prev->{$key} && $opts->{$key}->{copy} )
       {
          $final_props{$key} = $prev->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from previous DSN');
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
       }
       if ( !defined $final_props{$key} ) {
          $final_props{$key} = $defaults->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from defaults');
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
       }
    }
 
@@ -1319,7 +1319,7 @@
           grep { $o->has($_) && $o->get($_) }
           keys %{$self->{opts}}
         );
-   MKDEBUG && _d('DSN string made from options:', $dsn_string);
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
    return $self->parse($dsn_string);
 }
 
@@ -1369,7 +1369,7 @@
                      qw(F h P S A))
          . ';mysql_read_default_group=client';
    }
-   MKDEBUG && _d($dsn);
+   PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
 }
 
@@ -1414,7 +1414,7 @@
    my $dbh;
    my $tries = 2;
    while ( !$dbh && $tries-- ) {
-      MKDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
          join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
 
       eval {
@@ -1424,21 +1424,21 @@
             my $sql;
 
             $sql = 'SELECT @@SQL_MODE';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             my ($sql_mode) = $dbh->selectrow_array($sql);
 
             $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
                  . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
                  . ($sql_mode ? ",$sql_mode" : '')
                  . '\'*/';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             $dbh->do($sql);
 
             if ( my ($charset) = $cxn_string =~ m/charset=(\w+)/ ) {
                $sql = "/*!40101 SET NAMES $charset*/";
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
-               MKDEBUG && _d('Enabling charset for STDOUT');
+               PTDEBUG && _d('Enabling charset for STDOUT');
                if ( $charset eq 'utf8' ) {
                   binmode(STDOUT, ':utf8')
                      or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
@@ -1450,15 +1450,15 @@
 
             if ( $self->prop('set-vars') ) {
                $sql = "SET " . $self->prop('set-vars');
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
             }
          }
       };
       if ( !$dbh && $EVAL_ERROR ) {
-         MKDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d($EVAL_ERROR);
          if ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            MKDEBUG && _d('Going to try again without utf8 support');
+            PTDEBUG && _d('Going to try again without utf8 support');
             delete $defaults->{mysql_enable_utf8};
          }
          elsif ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
@@ -1476,7 +1476,7 @@
       }
    }
 
-   MKDEBUG && _d('DBH info: ',
+   PTDEBUG && _d('DBH info: ',
       $dbh,
       Dumper($dbh->selectrow_hashref(
          'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
@@ -1502,7 +1502,7 @@
 
 sub disconnect {
    my ( $self, $dbh ) = @_;
-   MKDEBUG && $self->print_active_handles($dbh);
+   PTDEBUG && $self->print_active_handles($dbh);
    $dbh->disconnect;
 }
 
@@ -1563,7 +1563,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
 
@@ -1581,17 +1581,17 @@
 
    check_PID_file(undef, $self->{PID_file});
 
-   MKDEBUG && _d('Daemonized child will log to', $self->{log_file});
+   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
 sub daemonize {
    my ( $self ) = @_;
 
-   MKDEBUG && _d('About to fork and daemonize');
+   PTDEBUG && _d('About to fork and daemonize');
    defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
    if ( $pid ) {
-      MKDEBUG && _d('I am the parent and now I die');
+      PTDEBUG && _d('I am the parent and now I die');
       exit;
    }
 
@@ -1633,19 +1633,19 @@
       }
    }
 
-   MKDEBUG && _d('I am the child and now I live daemonized');
+   PTDEBUG && _d('I am the child and now I live daemonized');
    return;
 }
 
 sub check_PID_file {
    my ( $self, $file ) = @_;
    my $PID_file = $self ? $self->{PID_file} : $file;
-   MKDEBUG && _d('Checking PID file', $PID_file);
+   PTDEBUG && _d('Checking PID file', $PID_file);
    if ( $PID_file && -f $PID_file ) {
       my $pid;
       eval { chomp($pid = `cat $PID_file`); };
       die "Cannot cat $PID_file: $OS_ERROR" if $EVAL_ERROR;
-      MKDEBUG && _d('PID file exists; it contains PID', $pid);
+      PTDEBUG && _d('PID file exists; it contains PID', $pid);
       if ( $pid ) {
          my $pid_is_alive = kill 0, $pid;
          if ( $pid_is_alive ) {
@@ -1663,7 +1663,7 @@
       }
    }
    else {
-      MKDEBUG && _d('No PID file');
+      PTDEBUG && _d('No PID file');
    }
    return;
 }
@@ -1683,7 +1683,7 @@
 
    my $PID_file = $self->{PID_file};
    if ( !$PID_file ) {
-      MKDEBUG && _d('No PID file to create');
+      PTDEBUG && _d('No PID file to create');
       return;
    }
 
@@ -1696,7 +1696,7 @@
    close $PID_FH
       or die "Cannot close PID file $PID_file: $OS_ERROR";
 
-   MKDEBUG && _d('Created PID file:', $self->{PID_file});
+   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
@@ -1705,10 +1705,10 @@
    if ( $self->{PID_file} && -f $self->{PID_file} ) {
       unlink $self->{PID_file}
          or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
-      MKDEBUG && _d('Removed PID file');
+      PTDEBUG && _d('Removed PID file');
    }
    else {
-      MKDEBUG && _d('No PID to remove');
+      PTDEBUG && _d('No PID to remove');
    }
    return;
 }
@@ -1750,7 +1750,7 @@
 use Socket qw(inet_aton);
 use sigtrap qw(handler finish untrapped normal-signals);
 
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 my $o;
 my $oktorun;
@@ -1863,7 +1863,7 @@
    # try to extract it from the $dbh
    if ( !$source_dsn->{h} ) {
       ($source_dsn->{h}) = $dbh->{mysql_hostinfo} =~ m/(\w+) via/;
-      MKDEBUG && _d('Got source host from dbh:', $source_dsn->{h});
+      PTDEBUG && _d('Got source host from dbh:', $source_dsn->{h});
    }
 
    my @cols = qw( server ts thread txn_id txn_time user hostname ip db tbl idx
@@ -1882,14 +1882,14 @@
       my $cols  = join(',', map { $q->quote($_) } @cols);
       my $parms = join(',', map { '?' } @cols);
       my $sql   = "INSERT IGNORE INTO $db_tbl($cols) VALUES($parms)";
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       $ins_sth  = $dest_dbh->prepare($sql);
 
       if ( $o->get('create-dest-table') ) {
          my $db_tbl = $q->quote($dest_dsn->{D}, $dest_dsn->{t});
          $sql       = $o->read_para_after(__FILE__, qr/MAGIC_dest_table/);
          $sql       =~ s/deadlocks/IF NOT EXISTS $db_tbl/;
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          $dest_dbh->do($sql);
       }
    }
@@ -1899,7 +1899,7 @@
    if ( $o->get('daemonize') ) {
       $daemon = new Daemon(o=>$o);
       $daemon->daemonize();
-      MKDEBUG && _d('I am a daemon now');
+      PTDEBUG && _d('I am a daemon now');
    }
    elsif ( $o->get('pid') ) {
       # We're not daemoninzing, it just handles PID stuff.
@@ -1930,7 +1930,7 @@
       }
 
       if ( $fingerprint ne $last_fingerprint ) {
-         MKDEBUG && _d('New deadlock');
+         PTDEBUG && _d('New deadlock');
          if ( $o->got('print') || !$o->got('dest') ) {
             my $sep = $o->get('tab') ? "\t" : ' ';
             print join($sep, @cols), "\n";
@@ -1945,14 +1945,14 @@
          }
       }
       else {
-         MKDEBUG && _d('Same deadlock, not printing');
+         PTDEBUG && _d('Same deadlock, not printing');
       }
       # Save deadlock's fingerprint for next interval.
       $last_fingerprint = $fingerprint;
 
       # If specified, clear the deadlock... 
       if ( my $db_tbl = $o->get('clear-deadlocks') ) {
-         MKDEBUG && _d('Creating --clear-deadlocks table', $db_tbl);
+         PTDEBUG && _d('Creating --clear-deadlocks table', $db_tbl);
          $dbh->{AutoCommit} = 0;
          my $sql = $o->read_para_after(__FILE__, qr/MAGIC_clear_deadlocks/);
 
@@ -1960,10 +1960,10 @@
             $sql =~ s/ENGINE=/TYPE=/;
          }
          $sql =~ s/test.deadlock_maker/$db_tbl/;
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          $dbh->do($sql);
          $sql = "INSERT INTO $db_tbl(a) VALUES(1)";
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          $dbh->do($sql); # I'm holding locks on the table now.
 
          # Fork off a child to try to take a lock on the table.
@@ -1971,11 +1971,11 @@
          if ( defined($pid) && $pid == 0 ) { # I am a child
             my $dbh_child = get_cxn($source_dsn, 0);
             $sql = "SELECT * FROM $db_tbl FOR UPDATE";
-            MKDEBUG && _d($sql);
+            PTDEBUG && _d($sql);
             eval { $dbh_child->do($sql); }; # Should block against parent.
-            MKDEBUG && _d($EVAL_ERROR); # Parent inserted value 0.
+            PTDEBUG && _d($EVAL_ERROR); # Parent inserted value 0.
             $sql = "DROP TABLE $db_tbl";
-            MKDEBUG && _d($sql);
+            PTDEBUG && _d($sql);
             $dbh_child->do($sql);
             exit;
          }
@@ -1984,9 +1984,9 @@
          }
          sleep 1;
          $sql = "INSERT INTO $db_tbl(a) VALUES(0)";# Will make child deadlock
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          eval { $dbh->do($sql); };
-         MKDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d($EVAL_ERROR);
          waitpid($pid, 0);
       }
       
@@ -2146,7 +2146,7 @@
       $fingerprint = $fingerprint
                    . join('', map { $txn->{$_} } qw(server ts thread) );
    }
-   MKDEBUG && _d('Deadlock fingerprint:', $fingerprint);
+   PTDEBUG && _d('Deadlock fingerprint:', $fingerprint);
    return $fingerprint;
 }
 
@@ -2736,6 +2736,6 @@
 
 =head1 VERSION
 
-pt-deadlock-logger 1.0.1
+pt-deadlock-logger 1.0.2
 
 =cut

=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2011-09-01 16:00:38 +0000
+++ bin/pt-diskstats	2011-12-29 16:12:24 +0000
@@ -888,7 +888,7 @@
 
 =head1 VERSION
 
-pt-diskstats 1.0.1
+pt-diskstats 1.0.2
 
 =cut
 

=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2011-09-01 16:00:38 +0000
+++ bin/pt-duplicate-key-checker	2011-12-29 16:12:24 +0000
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # ###########################################################################
 # VersionParser package
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class ) = @_;
@@ -32,7 +32,7 @@
 sub parse {
    my ( $self, $str ) = @_;
    my $result = sprintf('%03d%03d%03d', $str =~ m/(\d+)/g);
-   MKDEBUG && _d($str, 'parses to', $result);
+   PTDEBUG && _d($str, 'parses to', $result);
    return $result;
 }
 
@@ -43,7 +43,7 @@
          $dbh->selectrow_array('SELECT VERSION()'));
    }
    my $result = $self->{$dbh} ge $self->parse($target) ? 1 : 0;
-   MKDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
+   PTDEBUG && _d($self->{$dbh}, 'ge', $target, ':', $result);
    return $result;
 }
 
@@ -61,7 +61,7 @@
       }
       @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
    if ( $innodb ) {
-      MKDEBUG && _d("InnoDB support:", $innodb->{support});
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
       if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
          my $vars = $dbh->selectrow_hashref(
             "SHOW VARIABLES LIKE 'innodb_version'");
@@ -73,7 +73,7 @@
       }
    }
 
-   MKDEBUG && _d("InnoDB version:", $innodb_version);
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
    return $innodb_version;
 }
 
@@ -105,7 +105,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -182,7 +182,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -227,7 +227,7 @@
 
    my @defs   = $ddl =~ m/^(\s+`.*?),?$/gm;
    my @cols   = map { $_ =~ m/`([^`]+)`/ } @defs;
-   MKDEBUG && _d('Table cols:', join(', ', map { "`$_`" } @cols));
+   PTDEBUG && _d('Table cols:', join(', ', map { "`$_`" } @cols));
 
    my %def_for;
    @def_for{@cols} = @defs;
@@ -288,7 +288,7 @@
       }
       sort keys %{$tbl->{keys}};
 
-   MKDEBUG && _d('Indexes sorted best-first:', join(', ', @indexes));
+   PTDEBUG && _d('Indexes sorted best-first:', join(', ', @indexes));
    return @indexes;
 }
 
@@ -306,7 +306,7 @@
          ($best) = $self->sort_indexes($tbl);
       }
    }
-   MKDEBUG && _d('Best index found is', $best);
+   PTDEBUG && _d('Best index found is', $best);
    return $best;
 }
 
@@ -315,25 +315,25 @@
    return () unless $where;
    my $sql = 'EXPLAIN SELECT * FROM ' . $quoter->quote($database, $table)
       . ' WHERE ' . $where;
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    my $expl = $dbh->selectrow_hashref($sql);
    $expl = { map { lc($_) => $expl->{$_} } keys %$expl };
    if ( $expl->{possible_keys} ) {
-      MKDEBUG && _d('possible_keys =', $expl->{possible_keys});
+      PTDEBUG && _d('possible_keys =', $expl->{possible_keys});
       my @candidates = split(',', $expl->{possible_keys});
       my %possible   = map { $_ => 1 } @candidates;
       if ( $expl->{key} ) {
-         MKDEBUG && _d('MySQL chose', $expl->{key});
+         PTDEBUG && _d('MySQL chose', $expl->{key});
          unshift @candidates, grep { $possible{$_} } split(',', $expl->{key});
-         MKDEBUG && _d('Before deduping:', join(', ', @candidates));
+         PTDEBUG && _d('Before deduping:', join(', ', @candidates));
          my %seen;
          @candidates = grep { !$seen{$_}++ } @candidates;
       }
-      MKDEBUG && _d('Final list:', join(', ', @candidates));
+      PTDEBUG && _d('Final list:', join(', ', @candidates));
       return @candidates;
    }
    else {
-      MKDEBUG && _d('No keys in possible_keys');
+      PTDEBUG && _d('No keys in possible_keys');
       return ();
    }
 }
@@ -347,66 +347,66 @@
    my ($dbh, $db, $tbl) = @args{@required_args};
    my $q      = $self->{Quoter};
    my $db_tbl = $q->quote($db, $tbl);
-   MKDEBUG && _d('Checking', $db_tbl);
+   PTDEBUG && _d('Checking', $db_tbl);
 
    my $sql = "SHOW TABLES FROM " . $q->quote($db)
            . ' LIKE ' . $q->literal_like($tbl);
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    my $row;
    eval {
       $row = $dbh->selectrow_arrayref($sql);
    };
    if ( $EVAL_ERROR ) {
-      MKDEBUG && _d($EVAL_ERROR);
+      PTDEBUG && _d($EVAL_ERROR);
       return 0;
    }
    if ( !$row->[0] || $row->[0] ne $tbl ) {
-      MKDEBUG && _d('Table does not exist');
+      PTDEBUG && _d('Table does not exist');
       return 0;
    }
 
-   MKDEBUG && _d('Table exists; no privs to check');
+   PTDEBUG && _d('Table exists; no privs to check');
    return 1 unless $args{all_privs};
 
    $sql = "SHOW FULL COLUMNS FROM $db_tbl";
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    eval {
       $row = $dbh->selectrow_hashref($sql);
    };
    if ( $EVAL_ERROR ) {
-      MKDEBUG && _d($EVAL_ERROR);
+      PTDEBUG && _d($EVAL_ERROR);
       return 0;
    }
    if ( !scalar keys %$row ) {
-      MKDEBUG && _d('Table has no columns:', Dumper($row));
+      PTDEBUG && _d('Table has no columns:', Dumper($row));
       return 0;
    }
    my $privs = $row->{privileges} || $row->{Privileges};
 
    $sql = "DELETE FROM $db_tbl LIMIT 0";
-   MKDEBUG && _d($sql);
+   PTDEBUG && _d($sql);
    eval {
       $dbh->do($sql);
    };
    my $can_delete = $EVAL_ERROR ? 0 : 1;
 
-   MKDEBUG && _d('User privs on', $db_tbl, ':', $privs,
+   PTDEBUG && _d('User privs on', $db_tbl, ':', $privs,
       ($can_delete ? 'delete' : ''));
 
    if ( !($privs =~ m/select/ && $privs =~ m/insert/ && $privs =~ m/update/
           && $can_delete) ) {
-      MKDEBUG && _d('User does not have all privs');
+      PTDEBUG && _d('User does not have all privs');
       return 0;
    }
 
-   MKDEBUG && _d('User has all privs');
+   PTDEBUG && _d('User has all privs');
    return 1;
 }
 
 sub get_engine {
    my ( $self, $ddl, $opts ) = @_;
    my ( $engine ) = $ddl =~ m/\).*?(?:ENGINE|TYPE)=(\w+)/;
-   MKDEBUG && _d('Storage engine:', $engine);
+   PTDEBUG && _d('Storage engine:', $engine);
    return $engine || undef;
 }
 
@@ -422,7 +422,7 @@
       next KEY if $key =~ m/FOREIGN/;
 
       my $key_ddl = $key;
-      MKDEBUG && _d('Parsed key:', $key_ddl);
+      PTDEBUG && _d('Parsed key:', $key_ddl);
 
       if ( $engine !~ m/MEMORY|HEAP/ ) {
          $key =~ s/USING HASH/USING BTREE/;
@@ -448,7 +448,7 @@
       }
       $name =~ s/`//g;
 
-      MKDEBUG && _d( $name, 'key cols:', join(', ', map { "`$_`" } @cols));
+      PTDEBUG && _d( $name, 'key cols:', join(', ', map { "`$_`" } @cols));
 
       $keys->{$name} = {
          name         => $name,
@@ -470,7 +470,7 @@
          elsif ( $this_key->{is_unique} && !$this_key->{is_nullable} ) {
             $clustered_key = $this_key->{name};
          }
-         MKDEBUG && $clustered_key && _d('This key is the clustered key');
+         PTDEBUG && $clustered_key && _d('This key is the clustered key');
       }
    }
 
@@ -538,7 +538,7 @@
       }
       grep { $_->{name} ne $clustered_key }
       values %{$tbl_struct->{keys}};
-      MKDEBUG && _d('Secondary indexes:', Dumper(\@sec_indexes));
+      PTDEBUG && _d('Secondary indexes:', Dumper(\@sec_indexes));
 
       if ( @sec_indexes ) {
          $sec_indexes_ddl = join(' ', @sec_indexes);
@@ -548,7 +548,7 @@
       $ddl =~ s/,(\n\) )/$1/s;
    }
    else {
-      MKDEBUG && _d('Not removing secondary indexes from',
+      PTDEBUG && _d('Not removing secondary indexes from',
          $tbl_struct->{engine}, 'table');
    }
 
@@ -583,7 +583,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 ( our $before = <<'EOF') =~ s/^   //gm;
    /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -677,11 +677,11 @@
 sub _use_db {
    my ( $self, $dbh, $quoter, $new ) = @_;
    if ( !$new ) {
-      MKDEBUG && _d('No new DB to use');
+      PTDEBUG && _d('No new DB to use');
       return;
    }
    my $sql = 'USE ' . $quoter->quote($new);
-   MKDEBUG && _d($dbh, $sql);
+   PTDEBUG && _d($dbh, $sql);
    $dbh->do($sql);
    return;
 }
@@ -693,12 +693,12 @@
          . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
          . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
          . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       eval { $dbh->do($sql); };
-      MKDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
+      PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
       $self->_use_db($dbh, $quoter, $db);
       $sql = "SHOW CREATE TABLE " . $quoter->quote($db, $tbl);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $href;
       eval { $href = $dbh->selectrow_hashref($sql); };
       if ( $EVAL_ERROR ) {
@@ -708,15 +708,15 @@
 
       $sql = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
          . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       $dbh->do($sql);
       my ($key) = grep { m/create table/i } keys %$href;
       if ( $key ) {
-         MKDEBUG && _d('This table is a base table');
+         PTDEBUG && _d('This table is a base table');
          $self->{tables}->{$db}->{$tbl} = [ 'table', $href->{$key} ];
       }
       else {
-         MKDEBUG && _d('This table is a view');
+         PTDEBUG && _d('This table is a view');
          ($key) = grep { m/create view/i } keys %$href;
          $self->{tables}->{$db}->{$tbl} = [ 'view', $href->{$key} ];
       }
@@ -726,11 +726,11 @@
 
 sub get_columns {
    my ( $self, $dbh, $quoter, $db, $tbl ) = @_;
-   MKDEBUG && _d('Get columns for', $db, $tbl);
+   PTDEBUG && _d('Get columns for', $db, $tbl);
    if ( !$self->{cache} || !$self->{columns}->{$db}->{$tbl} ) {
       $self->_use_db($dbh, $quoter, $db);
       my $sql = "SHOW COLUMNS FROM " . $quoter->quote($db, $tbl);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $cols = $dbh->selectall_arrayref($sql, { Slice => {} });
 
       $self->{columns}->{$db}->{$tbl} = [
@@ -751,7 +751,7 @@
       map { '  ' . $quoter->quote($_->{field}) . ' ' . $_->{type} }
       @{$self->get_columns($dbh, $quoter, $db, $tbl)});
    $result .= "\n)";
-   MKDEBUG && _d($result);
+   PTDEBUG && _d($result);
    return $result;
 }
 
@@ -763,11 +763,11 @@
          . q{@@SQL_MODE := REPLACE(REPLACE(@@SQL_MODE, 'ANSI_QUOTES', ''), ',,', ','), }
          . '@OLD_QUOTE := @@SQL_QUOTE_SHOW_CREATE, '
          . '@@SQL_QUOTE_SHOW_CREATE := 1 */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       eval { $dbh->do($sql); };
-      MKDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
+      PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
       $sql = "SHOW TRIGGERS FROM " . $quoter->quote($db);
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my $sth = $dbh->prepare($sql);
       $sth->execute();
       if ( $sth->rows ) {
@@ -780,7 +780,7 @@
       }
       $sql = '/*!40101 SET @@SQL_MODE := @OLD_SQL_MODE, '
          . '@@SQL_QUOTE_SHOW_CREATE := @OLD_QUOTE */';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       $dbh->do($sql);
    }
    if ( $tbl ) {
@@ -799,7 +799,7 @@
          push @params, $like;
       }
       my $sth = $dbh->prepare($sql);
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       $sth->execute( @params );
       my @dbs = map { $_->[0] } @{$sth->fetchall_arrayref()};
       $self->{databases} = \@dbs unless $like;
@@ -817,7 +817,7 @@
          $sql .= ' LIKE ?';
          push @params, $like;
       }
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       my $sth = $dbh->prepare($sql);
       $sth->execute(@params);
       my @tables = @{$sth->fetchall_arrayref({})};
@@ -843,7 +843,7 @@
          $sql .= ' LIKE ?';
          push @params, $like;
       }
-      MKDEBUG && _d($sql, @params);
+      PTDEBUG && _d($sql, @params);
       my $sth = $dbh->prepare($sql);
       $sth->execute(@params);
       my @tables = @{$sth->fetchall_arrayref()};
@@ -888,7 +888,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 0;
@@ -911,7 +911,7 @@
       if ( !$opt->{key} || !$opt->{desc} ) {
          die "Invalid DSN option: ", Dumper($opt);
       }
-      MKDEBUG && _d('DSN option:',
+      PTDEBUG && _d('DSN option:',
          join(', ',
             map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
                keys %$opt
@@ -929,7 +929,7 @@
 sub prop {
    my ( $self, $prop, $value ) = @_;
    if ( @_ > 2 ) {
-      MKDEBUG && _d('Setting', $prop, 'property');
+      PTDEBUG && _d('Setting', $prop, 'property');
       $self->{$prop} = $value;
    }
    return $self->{$prop};
@@ -938,10 +938,10 @@
 sub parse {
    my ( $self, $dsn, $prev, $defaults ) = @_;
    if ( !$dsn ) {
-      MKDEBUG && _d('No DSN to parse');
+      PTDEBUG && _d('No DSN to parse');
       return;
    }
-   MKDEBUG && _d('Parsing', $dsn);
+   PTDEBUG && _d('Parsing', $dsn);
    $prev     ||= {};
    $defaults ||= {};
    my %given_props;
@@ -953,23 +953,23 @@
          $given_props{$prop_key} = $prop_val;
       }
       else {
-         MKDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
          $given_props{h} = $dsn_part;
       }
    }
 
    foreach my $key ( keys %$opts ) {
-      MKDEBUG && _d('Finding value for', $key);
+      PTDEBUG && _d('Finding value for', $key);
       $final_props{$key} = $given_props{$key};
       if (   !defined $final_props{$key}
            && defined $prev->{$key} && $opts->{$key}->{copy} )
       {
          $final_props{$key} = $prev->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from previous DSN');
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
       }
       if ( !defined $final_props{$key} ) {
          $final_props{$key} = $defaults->{$key};
-         MKDEBUG && _d('Copying value for', $key, 'from defaults');
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
       }
    }
 
@@ -1000,7 +1000,7 @@
           grep { $o->has($_) && $o->get($_) }
           keys %{$self->{opts}}
         );
-   MKDEBUG && _d('DSN string made from options:', $dsn_string);
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
    return $self->parse($dsn_string);
 }
 
@@ -1050,7 +1050,7 @@
                      qw(F h P S A))
          . ';mysql_read_default_group=client';
    }
-   MKDEBUG && _d($dsn);
+   PTDEBUG && _d($dsn);
    return ($dsn, $info->{u}, $info->{p});
 }
 
@@ -1095,7 +1095,7 @@
    my $dbh;
    my $tries = 2;
    while ( !$dbh && $tries-- ) {
-      MKDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, 
          join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
 
       eval {
@@ -1105,21 +1105,21 @@
             my $sql;
 
             $sql = 'SELECT @@SQL_MODE';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             my ($sql_mode) = $dbh->selectrow_array($sql);
 
             $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
                  . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
                  . ($sql_mode ? ",$sql_mode" : '')
                  . '\'*/';
-            MKDEBUG && _d($dbh, $sql);
+            PTDEBUG && _d($dbh, $sql);
             $dbh->do($sql);
 
             if ( my ($charset) = $cxn_string =~ m/charset=(\w+)/ ) {
                $sql = "/*!40101 SET NAMES $charset*/";
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
-               MKDEBUG && _d('Enabling charset for STDOUT');
+               PTDEBUG && _d('Enabling charset for STDOUT');
                if ( $charset eq 'utf8' ) {
                   binmode(STDOUT, ':utf8')
                      or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
@@ -1131,15 +1131,15 @@
 
             if ( $self->prop('set-vars') ) {
                $sql = "SET " . $self->prop('set-vars');
-               MKDEBUG && _d($dbh, ':', $sql);
+               PTDEBUG && _d($dbh, ':', $sql);
                $dbh->do($sql);
             }
          }
       };
       if ( !$dbh && $EVAL_ERROR ) {
-         MKDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d($EVAL_ERROR);
          if ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            MKDEBUG && _d('Going to try again without utf8 support');
+            PTDEBUG && _d('Going to try again without utf8 support');
             delete $defaults->{mysql_enable_utf8};
          }
          elsif ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
@@ -1157,7 +1157,7 @@
       }
    }
 
-   MKDEBUG && _d('DBH info: ',
+   PTDEBUG && _d('DBH info: ',
       $dbh,
       Dumper($dbh->selectrow_hashref(
          'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
@@ -1183,7 +1183,7 @@
 
 sub disconnect {
    my ( $self, $dbh ) = @_;
-   MKDEBUG && $self->print_active_handles($dbh);
+   PTDEBUG && $self->print_active_handles($dbh);
    $dbh->disconnect;
 }
 
@@ -1244,7 +1244,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 use Getopt::Long;
@@ -1328,7 +1328,7 @@
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
    if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      MKDEBUG && _d('Parsing DSN OPTIONS');
+      PTDEBUG && _d('Parsing DSN OPTIONS');
       my $dsn_attribs = {
          dsn  => 1,
          copy => 1,
@@ -1372,7 +1372,7 @@
 
    if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
       $self->{version} = $1;
-      MKDEBUG && _d($self->{version});
+      PTDEBUG && _d($self->{version});
    }
 
    return;
@@ -1409,7 +1409,7 @@
       chomp $para;
       $para =~ s/\s+/ /g;
       $para =~ s/$POD_link_re/$1/go;
-      MKDEBUG && _d('Option rule:', $para);
+      PTDEBUG && _d('Option rule:', $para);
       push @rules, $para;
    }
 
@@ -1418,7 +1418,7 @@
    do {
       if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
          chomp $para;
-         MKDEBUG && _d($para);
+         PTDEBUG && _d($para);
          my %attribs;
 
          $para = <$fh>; # read next paragraph, possibly attributes
@@ -1437,7 +1437,7 @@
             $para = <$fh>; # read next paragraph, probably short help desc
          }
          else {
-            MKDEBUG && _d('Option has no attributes');
+            PTDEBUG && _d('Option has no attributes');
          }
 
          $para =~ s/\s+\Z//g;
@@ -1445,7 +1445,7 @@
          $para =~ s/$POD_link_re/$1/go;
 
          $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         MKDEBUG && _d('Short help:', $para);
+         PTDEBUG && _d('Short help:', $para);
 
          die "No description after option spec $option" if $para =~ m/^=item/;
 
@@ -1483,7 +1483,7 @@
 
    foreach my $opt ( @specs ) {
       if ( ref $opt ) { # It's an option spec, not a rule.
-         MKDEBUG && _d('Parsing opt spec:',
+         PTDEBUG && _d('Parsing opt spec:',
             map { ($_, '=>', $opt->{$_}) } keys %$opt);
 
          my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
@@ -1496,7 +1496,7 @@
          $self->{opts}->{$long} = $opt;
 
          if ( length $long == 1 ) {
-            MKDEBUG && _d('Long opt', $long, 'looks like short opt');
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
             $self->{short_opts}->{$long} = $long;
          }
 
@@ -1522,14 +1522,14 @@
 
          my ( $type ) = $opt->{spec} =~ m/=(.)/;
          $opt->{type} = $type;
-         MKDEBUG && _d($long, 'type:', $type);
+         PTDEBUG && _d($long, 'type:', $type);
 
 
          $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
 
          if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
             $self->{defaults}->{$long} = defined $def ? $def : 1;
-            MKDEBUG && _d($long, 'default:', $def);
+            PTDEBUG && _d($long, 'default:', $def);
          }
 
          if ( $long eq 'config' ) {
@@ -1538,13 +1538,13 @@
 
          if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
             $disables{$long} = $dis;
-            MKDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
          }
 
          $self->{opts}->{$long} = $opt;
       }
       else { # It's an option rule, not a spec.
-         MKDEBUG && _d('Parsing rule:', $opt); 
+         PTDEBUG && _d('Parsing rule:', $opt); 
          push @{$self->{rules}}, $opt;
          my @participants = $self->_get_participants($opt);
          my $rule_ok = 0;
@@ -1552,17 +1552,17 @@
          if ( $opt =~ m/mutually exclusive|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{mutex}}, \@participants;
-            MKDEBUG && _d(@participants, 'are mutually exclusive');
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
          }
          if ( $opt =~ m/at least one|one and only one/ ) {
             $rule_ok = 1;
             push @{$self->{atleast1}}, \@participants;
-            MKDEBUG && _d(@participants, 'require at least one');
+            PTDEBUG && _d(@participants, 'require at least one');
          }
          if ( $opt =~ m/default to/ ) {
             $rule_ok = 1;
             $self->{defaults_to}->{$participants[0]} = $participants[1];
-            MKDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
          }
          if ( $opt =~ m/restricted to option groups/ ) {
             $rule_ok = 1;
@@ -1576,7 +1576,7 @@
          if( $opt =~ m/accepts additional command-line arguments/ ) {
             $rule_ok = 1;
             $self->{strict} = 0;
-            MKDEBUG && _d("Strict mode disabled by rule");
+            PTDEBUG && _d("Strict mode disabled by rule");
          }
 
          die "Unrecognized option rule: $opt" unless $rule_ok;
@@ -1586,7 +1586,7 @@
    foreach my $long ( keys %disables ) {
       my @participants = $self->_get_participants($disables{$long});
       $self->{disables}->{$long} = \@participants;
-      MKDEBUG && _d('Option', $long, 'disables', @participants);
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
    }
 
    return; 
@@ -1600,7 +1600,7 @@
          unless exists $self->{opts}->{$long};
       push @participants, $long;
    }
-   MKDEBUG && _d('Participants for', $str, ':', @participants);
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
    return @participants;
 }
 
@@ -1623,7 +1623,7 @@
       die "Cannot set default for nonexistent option $long"
          unless exists $self->{opts}->{$long};
       $self->{defaults}->{$long} = $defaults{$long};
-      MKDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
    }
    return;
 }
@@ -1652,7 +1652,7 @@
       $opt->{value} = $val;
    }
    $opt->{got} = 1;
-   MKDEBUG && _d('Got option', $long, '=', $val);
+   PTDEBUG && _d('Got option', $long, '=', $val);
 }
 
 sub get_opts {
@@ -1683,7 +1683,7 @@
             if ( $self->got('config') ) {
                die $EVAL_ERROR;
             }
-            elsif ( MKDEBUG ) {
+            elsif ( PTDEBUG ) {
                _d($EVAL_ERROR);
             }
          }
@@ -1750,7 +1750,7 @@
             if ( exists $self->{disables}->{$long} ) {
                my @disable_opts = @{$self->{disables}->{$long}};
                map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               MKDEBUG && _d('Unset options', @disable_opts,
+               PTDEBUG && _d('Unset options', @disable_opts,
                   'because', $long,'disables them');
             }
 
@@ -1799,7 +1799,7 @@
             delete $long[$i];
          }
          else {
-            MKDEBUG && _d('Temporarily failed to parse', $long);
+            PTDEBUG && _d('Temporarily failed to parse', $long);
          }
       }
 
@@ -1823,12 +1823,12 @@
    my $val = $opt->{value};
 
    if ( $val && $opt->{type} eq 'm' ) {  # type time
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
       my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
       if ( !$suffix ) {
          my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
          $suffix = $s || 's';
-         MKDEBUG && _d('No suffix given; using', $suffix, 'for',
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
             $opt->{long}, '(value:', $val, ')');
       }
       if ( $suffix =~ m/[smhd]/ ) {
@@ -1837,23 +1837,23 @@
               : $suffix eq 'h' ? $num * 3600     # Hours
               :                  $num * 86400;   # Days
          $opt->{value} = ($prefix || '') . $val;
-         MKDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
       }
       else {
          $self->save_error("Invalid time suffix for --$opt->{long}");
       }
    }
    elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
       my $prev = {};
       my $from_key = $self->{defaults_to}->{ $opt->{long} };
       if ( $from_key ) {
-         MKDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
          if ( $self->{opts}->{$from_key}->{parsed} ) {
             $prev = $self->{opts}->{$from_key}->{value};
          }
          else {
-            MKDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
                $from_key, 'parsed');
             return;
          }
@@ -1862,7 +1862,7 @@
       $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
    }
    elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      MKDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
       $self->_parse_size($opt, $val);
    }
    elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
@@ -1872,7 +1872,7 @@
       $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
    }
    else {
-      MKDEBUG && _d('Nothing to validate for option',
+      PTDEBUG && _d('Nothing to validate for option',
          $opt->{long}, 'type', $opt->{type}, 'value', $val);
    }
 
@@ -1946,11 +1946,11 @@
    $file ||= $self->{file} || __FILE__;
 
    if ( !$self->{description} || !$self->{usage} ) {
-      MKDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
       my %synop = $self->_parse_synopsis($file);
       $self->{description} ||= $synop{description};
       $self->{usage}       ||= $synop{usage};
-      MKDEBUG && _d("Description:", $self->{description},
+      PTDEBUG && _d("Description:", $self->{description},
          "\nUsage:", $self->{usage});
    }
 
@@ -2165,7 +2165,7 @@
    my ( $self, $opt, $val ) = @_;
 
    if ( lc($val || '') eq 'null' ) {
-      MKDEBUG && _d('NULL size for', $opt->{long});
+      PTDEBUG && _d('NULL size for', $opt->{long});
       $opt->{value} = 'null';
       return;
    }
@@ -2175,7 +2175,7 @@
    if ( defined $num ) {
       if ( $factor ) {
          $num *= $factor_for{$factor};
-         MKDEBUG && _d('Setting option', $opt->{y},
+         PTDEBUG && _d('Setting option', $opt->{y},
             'to num', $num, '* factor', $factor);
       }
       $opt->{value} = ($pre || '') . $num;
@@ -2199,7 +2199,7 @@
 sub _parse_synopsis {
    my ( $self, $file ) = @_;
    $file ||= $self->{file} || __FILE__;
-   MKDEBUG && _d("Parsing SYNOPSIS in", $file);
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
 
    local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
    open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
@@ -2212,7 +2212,7 @@
       push @synop, $para;
    }
    close $fh;
-   MKDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
    my ($usage, $desc) = @synop;
    die "The SYNOPSIS section in $file is not formatted properly"
       unless $usage && $desc;
@@ -2239,7 +2239,7 @@
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
-if ( MKDEBUG ) {
+if ( PTDEBUG ) {
    print '# ', $^X, ' ', $], "\n";
    if ( my $uname = `uname -a` ) {
       $uname =~ s/\s+/ /g;
@@ -2269,7 +2269,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -2296,7 +2296,7 @@
    }
 
    my $key_exists = $self->_key_exists(%args);
-   MKDEBUG && _d('Key', $name, 'exists in', $args{tbl_name}, ':',
+   PTDEBUG && _d('Key', $name, 'exists in', $args{tbl_name}, ':',
       $key_exists ? 'yes': 'no');
 
    my $sql = 'EXPLAIN SELECT ' . join(', ', @cols)
@@ -2312,7 +2312,7 @@
    }
    $sql .= join(' OR ', @where_cols);
    $self->{query} = $sql;
-   MKDEBUG && _d('sql:', $sql);
+   PTDEBUG && _d('sql:', $sql);
 
    my $explain;
    my $sth = $dbh->prepare($sql);
@@ -2328,7 +2328,7 @@
    my $key_len      = $explain->{key_len};
    my $rows         = $explain->{rows};
    my $chosen_key   = $explain->{key};  # May differ from $name
-   MKDEBUG && _d('MySQL chose key:', $chosen_key, 'len:', $key_len,
+   PTDEBUG && _d('MySQL chose key:', $chosen_key, 'len:', $key_len,
       'rows:', $rows);
 
    my $key_size = 0;
@@ -2404,7 +2404,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -2431,14 +2431,14 @@
       if ( $key->{name} eq 'PRIMARY'
            || ($args{clustered_key} && $key->{name} eq $args{clustered_key}) ) {
          $primary_key = $key;
-         MKDEBUG && _d('primary key:', $key->{name});
+         PTDEBUG && _d('primary key:', $key->{name});
          next KEY;
       }
 
       my $is_fulltext = $key->{type} eq 'FULLTEXT' ? 1 : 0;
       if ( $args{ignore_order} || $is_fulltext  ) {
          my $ordered_cols = join(',', sort(split(/,/, $key->{colnames})));
-         MKDEBUG && _d('Reordered', $key->{name}, 'cols from',
+         PTDEBUG && _d('Reordered', $key->{name}, 'cols from',
             $key->{colnames}, 'to', $ordered_cols); 
          $key->{colnames} = $ordered_cols;
       }
@@ -2453,42 +2453,42 @@
    push @normal_keys, $self->unconstrain_keys($primary_key, \@unique_keys);
 
    if ( $primary_key ) {
-      MKDEBUG && _d('Comparing PRIMARY KEY to UNIQUE keys');
+      PTDEBUG && _d('Comparing PRIMARY KEY to UNIQUE keys');
       push @dupes,
          $self->remove_prefix_duplicates([$primary_key], \@unique_keys, %args);
 
-      MKDEBUG && _d('Comparing PRIMARY KEY to normal keys');
+      PTDEBUG && _d('Comparing PRIMARY KEY to normal keys');
       push @dupes,
          $self->remove_prefix_duplicates([$primary_key], \@normal_keys, %args);
    }
 
-   MKDEBUG && _d('Comparing UNIQUE keys to normal keys');
+   PTDEBUG && _d('Comparing UNIQUE keys to normal keys');
    push @dupes,
       $self->remove_prefix_duplicates(\@unique_keys, \@normal_keys, %args);
 
-   MKDEBUG && _d('Comparing normal keys');
+   PTDEBUG && _d('Comparing normal keys');
    push @dupes,
       $self->remove_prefix_duplicates(\@normal_keys, \@normal_keys, %args);
 
-   MKDEBUG && _d('Comparing FULLTEXT keys');
+   PTDEBUG && _d('Comparing FULLTEXT keys');
    push @dupes,
       $self->remove_prefix_duplicates(\@fulltext_keys, \@fulltext_keys, %args, exact_duplicates => 1);
 
 
    my $clustered_key = $args{clustered_key} ? $keys{$args{clustered_key}}
                      : undef;
-   MKDEBUG && _d('clustered key:', $clustered_key->{name},
+   PTDEBUG && _d('clustered key:', $clustered_key->{name},
       $clustered_key->{colnames});
    if ( $clustered_key
         && $args{clustered}
         && $args{tbl_info}->{engine}
         && $args{tbl_info}->{engine} =~ m/InnoDB/i )
    {
-      MKDEBUG && _d('Removing UNIQUE dupes of clustered key');
+      PTDEBUG && _d('Removing UNIQUE dupes of clustered key');
       push @dupes,
          $self->remove_clustered_duplicates($clustered_key, \@unique_keys, %args);
 
-      MKDEBUG && _d('Removing ordinary dupes of clustered key');
+      PTDEBUG && _d('Removing ordinary dupes of clustered key');
       push @dupes,
          $self->remove_clustered_duplicates($clustered_key, \@normal_keys, %args);
    }
@@ -2588,25 +2588,25 @@
          my $right_cols     = $right_keys->[$right_index]->{colnames};
          my $right_len_cols = $right_keys->[$right_index]->{len_cols};
 
-         MKDEBUG && _d('Comparing left', $left_name, '(',$left_cols,')',
+         PTDEBUG && _d('Comparing left', $left_name, '(',$left_cols,')',
             'to right', $right_name, '(',$right_cols,')');
 
          if (    substr($left_cols,  0, $right_len_cols)
               eq substr($right_cols, 0, $right_len_cols) ) {
 
             if ( $args{exact_duplicates} && ($right_len_cols<$left_len_cols) ) {
-               MKDEBUG && _d($right_name, 'not exact duplicate of', $left_name);
+               PTDEBUG && _d($right_name, 'not exact duplicate of', $left_name);
                next RIGHT_KEY;
             }
 
             if ( exists $right_keys->[$right_index]->{unique_col} ) {
-               MKDEBUG && _d('Cannot remove', $right_name,
+               PTDEBUG && _d('Cannot remove', $right_name,
                   'because is constrains col',
                   $right_keys->[$right_index]->{cols}->[0]);
                next RIGHT_KEY;
             }
 
-            MKDEBUG && _d('Remove', $right_name);
+            PTDEBUG && _d('Remove', $right_name);
             my $reason;
             if ( $right_keys->[$right_index]->{unconstrained} ) {
                $reason .= "Uniqueness of $right_name ignored because "
@@ -2634,12 +2634,12 @@
             $args{callback}->($dupe, %args) if $args{callback};
          }
          else {
-            MKDEBUG && _d($right_name, 'not left-prefix of', $left_name);
+            PTDEBUG && _d($right_name, 'not left-prefix of', $left_name);
             next LEFT_KEY;
          }
       } # RIGHT_KEY
    } # LEFT_KEY
-   MKDEBUG && _d('No more keys');
+   PTDEBUG && _d('No more keys');
 
    @$left_keys  = grep { defined $_; } @$left_keys;
    @$right_keys = grep { defined $_; } @$right_keys;
@@ -2658,7 +2658,7 @@
    for my $i ( 0 .. @$keys - 1 ) {
       my $key = $keys->[$i]->{colnames};
       if ( $key =~ m/$ck_cols$/ ) {
-         MKDEBUG && _d("clustered key dupe:", $keys->[$i]->{name},
+         PTDEBUG && _d("clustered key dupe:", $keys->[$i]->{name},
             $keys->[$i]->{colnames});
          my $dupe = {
             key               => $keys->[$i]->{name},
@@ -2681,7 +2681,7 @@
          $args{callback}->($dupe, %args) if $args{callback};
       }
    }
-   MKDEBUG && _d('No more keys');
+   PTDEBUG && _d('No more keys');
 
    @$keys = grep { defined $_; } @$keys;
 
@@ -2704,14 +2704,14 @@
    my %unconstrain;
    my @unconstrained_keys;
 
-   MKDEBUG && _d('Unconstraining redundantly unique keys');
+   PTDEBUG && _d('Unconstraining redundantly unique keys');
 
    UNIQUE_KEY:
    foreach my $unique_key ( $primary_key, @$unique_keys ) {
       next unless $unique_key; # primary key may be undefined
       my $cols = $unique_key->{cols};
       if ( @$cols == 1 ) {
-         MKDEBUG && _d($unique_key->{name},'defines unique column:',$cols->[0]);
+         PTDEBUG && _d($unique_key->{name},'defines unique column:',$cols->[0]);
          if ( !exists $unique_cols{$cols->[0]} ) {
             $unique_cols{$cols->[0]}  = $unique_key;
             $unique_key->{unique_col} = 1;
@@ -2719,7 +2719,7 @@
       }
       else {
          local $LIST_SEPARATOR = '-';
-         MKDEBUG && _d($unique_key->{name}, 'defines unique set:', @$cols);
+         PTDEBUG && _d($unique_key->{name}, 'defines unique set:', @$cols);
          push @unique_sets, { cols => $cols, key => $unique_key };
       }
    }
@@ -2730,14 +2730,14 @@
       COL:
       foreach my $col ( @{$unique_set->{cols}} ) {
          if ( exists $unique_cols{$col} ) {
-            MKDEBUG && _d('Unique set', $unique_set->{key}->{name},
+            PTDEBUG && _d('Unique set', $unique_set->{key}->{name},
                'has unique col', $col);
             last COL if ++$n_unique_cols > 1;
             $unique_set->{constraining_key} = $unique_cols{$col};
          }
       }
       if ( $n_unique_cols && $unique_set->{key}->{name} ne 'PRIMARY' ) {
-         MKDEBUG && _d('Will unconstrain unique set',
+         PTDEBUG && _d('Will unconstrain unique set',
             $unique_set->{key}->{name},
             'because it is redundantly constrained by key',
             $unique_set->{constraining_key}->{name},
@@ -2749,7 +2749,7 @@
 
    for my $i ( 0..(scalar @$unique_keys-1) ) {
       if ( exists $unconstrain{$unique_keys->[$i]->{name}} ) {
-         MKDEBUG && _d('Unconstraining', $unique_keys->[$i]->{name});
+         PTDEBUG && _d('Unconstraining', $unique_keys->[$i]->{name});
          $unique_keys->[$i]->{unconstrained} = 1;
          $unique_keys->[$i]->{constraining_key}
             = $unconstrain{$unique_keys->[$i]->{name}};
@@ -2758,7 +2758,7 @@
       }
    }
 
-   MKDEBUG && _d('No more keys');
+   PTDEBUG && _d('No more keys');
    return @unconstrained_keys;
 }
 
@@ -2790,7 +2790,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
 
@@ -2808,17 +2808,17 @@
 
    check_PID_file(undef, $self->{PID_file});
 
-   MKDEBUG && _d('Daemonized child will log to', $self->{log_file});
+   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
 sub daemonize {
    my ( $self ) = @_;
 
-   MKDEBUG && _d('About to fork and daemonize');
+   PTDEBUG && _d('About to fork and daemonize');
    defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
    if ( $pid ) {
-      MKDEBUG && _d('I am the parent and now I die');
+      PTDEBUG && _d('I am the parent and now I die');
       exit;
    }
 
@@ -2860,19 +2860,19 @@
       }
    }
 
-   MKDEBUG && _d('I am the child and now I live daemonized');
+   PTDEBUG && _d('I am the child and now I live daemonized');
    return;
 }
 
 sub check_PID_file {
    my ( $self, $file ) = @_;
    my $PID_file = $self ? $self->{PID_file} : $file;
-   MKDEBUG && _d('Checking PID file', $PID_file);
+   PTDEBUG && _d('Checking PID file', $PID_file);
    if ( $PID_file && -f $PID_file ) {
       my $pid;
       eval { chomp($pid = `cat $PID_file`); };
       die "Cannot cat $PID_file: $OS_ERROR" if $EVAL_ERROR;
-      MKDEBUG && _d('PID file exists; it contains PID', $pid);
+      PTDEBUG && _d('PID file exists; it contains PID', $pid);
       if ( $pid ) {
          my $pid_is_alive = kill 0, $pid;
          if ( $pid_is_alive ) {
@@ -2890,7 +2890,7 @@
       }
    }
    else {
-      MKDEBUG && _d('No PID file');
+      PTDEBUG && _d('No PID file');
    }
    return;
 }
@@ -2910,7 +2910,7 @@
 
    my $PID_file = $self->{PID_file};
    if ( !$PID_file ) {
-      MKDEBUG && _d('No PID file to create');
+      PTDEBUG && _d('No PID file to create');
       return;
    }
 
@@ -2923,7 +2923,7 @@
    close $PID_FH
       or die "Cannot close PID file $PID_file: $OS_ERROR";
 
-   MKDEBUG && _d('Created PID file:', $self->{PID_file});
+   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
@@ -2932,10 +2932,10 @@
    if ( $self->{PID_file} && -f $self->{PID_file} ) {
       unlink $self->{PID_file}
          or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
-      MKDEBUG && _d('Removed PID file');
+      PTDEBUG && _d('Removed PID file');
    }
    else {
-      MKDEBUG && _d('No PID to remove');
+      PTDEBUG && _d('No PID to remove');
    }
    return;
 }
@@ -2976,7 +2976,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 sub new {
    my ( $class, %args ) = @_;
@@ -3038,7 +3038,7 @@
    my ($col, $tbl, $db);
    if ( my $col_name = $args{col_name} ) {
       ($col, $tbl, $db) = reverse map { s/`//g; $_ } split /[.]/, $col_name;
-      MKDEBUG && _d('Column', $col_name, 'has db', $db, 'tbl', $tbl,
+      PTDEBUG && _d('Column', $col_name, 'has db', $db, 'tbl', $tbl,
          'col', $col);
    }
    else {
@@ -3050,18 +3050,18 @@
    $col = lc $col;
 
    if ( !$col ) {
-      MKDEBUG && _d('No column specified or parsed');
+      PTDEBUG && _d('No column specified or parsed');
       return;
    }
-   MKDEBUG && _d('Finding column', $col, 'in', $db, $tbl);
+   PTDEBUG && _d('Finding column', $col, 'in', $db, $tbl);
 
    if ( $db && !$schema->{$db} ) {
-      MKDEBUG && _d('Database', $db, 'does not exist');
+      PTDEBUG && _d('Database', $db, 'does not exist');
       return;
    }
 
    if ( $db && $tbl && !$schema->{$db}->{$tbl} ) {
-      MKDEBUG && _d('Table', $tbl, 'does not exist in database', $db);
+      PTDEBUG && _d('Table', $tbl, 'does not exist in database', $db);
       return;
    }
 
@@ -3078,13 +3078,13 @@
          if ( $ignore
               && grep { $_->{db} eq $search_db && $_->{tbl} eq $search_tbl }
                  @$ignore ) {
-            MKDEBUG && _d('Ignoring', $search_db, $search_tbl, $col);
+            PTDEBUG && _d('Ignoring', $search_db, $search_tbl, $col);
             next TABLE;
          }
 
          my $tbl = $schema->{$search_db}->{$search_tbl};
          if ( $tbl->{tbl_struct}->{is_col}->{$col} ) {
-            MKDEBUG && _d('Column', $col, 'exists in', $tbl->{db}, $tbl->{tbl});
+            PTDEBUG && _d('Column', $col, 'exists in', $tbl->{db}, $tbl->{tbl});
             push @tbls, $tbl;
          }
       }
@@ -3101,7 +3101,7 @@
    my ($tbl, $db);
    if ( my $tbl_name = $args{tbl_name} ) {
       ($tbl, $db) = reverse map { s/`//g; $_ } split /[.]/, $tbl_name;
-      MKDEBUG && _d('Table', $tbl_name, 'has db', $db, 'tbl', $tbl);
+      PTDEBUG && _d('Table', $tbl_name, 'has db', $db, 'tbl', $tbl);
    }
    else {
       ($tbl, $db) = @args{qw(tbl db)};
@@ -3111,18 +3111,18 @@
    $tbl = lc $tbl;
 
    if ( !$tbl ) {
-      MKDEBUG && _d('No table specified or parsed');
+      PTDEBUG && _d('No table specified or parsed');
       return;
    }
-   MKDEBUG && _d('Finding table', $tbl, 'in', $db);
+   PTDEBUG && _d('Finding table', $tbl, 'in', $db);
 
    if ( $db && !$schema->{$db} ) {
-      MKDEBUG && _d('Database', $db, 'does not exist');
+      PTDEBUG && _d('Database', $db, 'does not exist');
       return;
    }
 
    if ( $db && $tbl && !$schema->{$db}->{$tbl} ) {
-      MKDEBUG && _d('Table', $tbl, 'does not exist in database', $db);
+      PTDEBUG && _d('Table', $tbl, 'does not exist in database', $db);
       return;
    }
 
@@ -3131,12 +3131,12 @@
    DATABASE:
    foreach my $search_db ( @search_dbs ) {
       if ( $ignore && grep { $_->{db} eq $search_db } @$ignore ) {
-         MKDEBUG && _d('Ignoring', $search_db);
+         PTDEBUG && _d('Ignoring', $search_db);
          next DATABASE;
       }
 
       if ( exists $schema->{$search_db}->{$tbl} ) {
-         MKDEBUG && _d('Table', $tbl, 'exists in', $search_db);
+         PTDEBUG && _d('Table', $tbl, 'exists in', $search_db);
          push @dbs, $search_db;
       }
    }
@@ -3172,7 +3172,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -3234,11 +3234,11 @@
             if ( $is_table ) {
                my ($db, $tbl) = $q->split_unquote($obj);
                $db ||= '*';
-               MKDEBUG && _d('Filter', $filter, 'value:', $db, $tbl);
+               PTDEBUG && _d('Filter', $filter, 'value:', $db, $tbl);
                $filters{$filter}->{$tbl} = $db;
             }
             else { # database
-               MKDEBUG && _d('Filter', $filter, 'value:', $obj);
+               PTDEBUG && _d('Filter', $filter, 'value:', $obj);
                $filters{$filter}->{$obj} = 1;
             }
          }
@@ -3254,11 +3254,11 @@
          my $pat = $o->get($filter);
          next REGEX_FILTER unless $pat;
          $filters{$filter} = qr/$pat/;
-         MKDEBUG && _d('Filter', $filter, 'value:', $filters{$filter});
+         PTDEBUG && _d('Filter', $filter, 'value:', $filters{$filter});
       }
    }
 
-   MKDEBUG && _d('Schema object filters:', Dumper(\%filters));
+   PTDEBUG && _d('Schema object filters:', Dumper(\%filters));
    return \%filters;
 }
 
@@ -3286,7 +3286,7 @@
       }
    }
 
-   MKDEBUG && _d('Next schema object:', $schema_obj->{db}, $schema_obj->{tbl});
+   PTDEBUG && _d('Next schema object:', $schema_obj->{db}, $schema_obj->{tbl});
    return $schema_obj;
 }
 
@@ -3296,14 +3296,14 @@
    if ( !$self->{fh} ) {
       my ($fh, $file) = $self->{file_itr}->();
       if ( !$fh ) {
-         MKDEBUG && _d('No more files to iterate');
+         PTDEBUG && _d('No more files to iterate');
          return;
       }
       $self->{fh}   = $fh;
       $self->{file} = $file;
    }
    my $fh = $self->{fh};
-   MKDEBUG && _d('Getting next schema object from', $self->{file});
+   PTDEBUG && _d('Getting next schema object from', $self->{file});
 
    local $INPUT_RECORD_SEPARATOR = '';
    CHUNK:
@@ -3318,7 +3318,7 @@
       }
       elsif ($self->{db} && $chunk =~ m/CREATE TABLE/) {
          if ($chunk =~ m/DROP VIEW IF EXISTS/) {
-            MKDEBUG && _d('Table is a VIEW, skipping');
+            PTDEBUG && _d('Table is a VIEW, skipping');
             next CHUNK;
          }
 
@@ -3346,7 +3346,7 @@
       }
    }  # CHUNK
 
-   MKDEBUG && _d('No more schema objects in', $self->{file});
+   PTDEBUG && _d('No more schema objects in', $self->{file});
    close $self->{fh};
    $self->{fh} = undef;
 
@@ -3357,26 +3357,26 @@
    my ( $self ) = @_;
    my $q   = $self->{Quoter};
    my $dbh = $self->{dbh};
-   MKDEBUG && _d('Getting next schema object from dbh', $dbh);
+   PTDEBUG && _d('Getting next schema object from dbh', $dbh);
 
    if ( !defined $self->{dbs} ) {
       my $sql = 'SHOW DATABASES';
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my @dbs = grep { $self->database_is_allowed($_) }
                 @{$dbh->selectcol_arrayref($sql)};
-      MKDEBUG && _d('Found', scalar @dbs, 'databases');
+      PTDEBUG && _d('Found', scalar @dbs, 'databases');
       $self->{dbs} = \@dbs;
    }
 
    if ( !$self->{db} ) {
       $self->{db} = shift @{$self->{dbs}};
-      MKDEBUG && _d('Next database:', $self->{db});
+      PTDEBUG && _d('Next database:', $self->{db});
       return unless $self->{db};
    }
 
    if ( !defined $self->{tbls} ) {
       my $sql = 'SHOW /*!50002 FULL*/ TABLES FROM ' . $q->quote($self->{db});
-      MKDEBUG && _d($sql);
+      PTDEBUG && _d($sql);
       my @tbls = map {
          $_->[0];  # (tbl, type)
       }
@@ -3386,7 +3386,7 @@
             && (!$type || ($type ne 'VIEW'));
       }
       @{$dbh->selectall_arrayref($sql)};
-      MKDEBUG && _d('Found', scalar @tbls, 'tables in database', $self->{db});
+      PTDEBUG && _d('Found', scalar @tbls, 'tables in database', $self->{db});
       $self->{tbls} = \@tbls;
    }
 
@@ -3396,9 +3396,9 @@
            || $self->{filters}->{'ignore-engines'} ) {
          my $sql = "SHOW TABLE STATUS FROM " . $q->quote($self->{db})
                  . " LIKE \'$tbl\'";
-         MKDEBUG && _d($sql);
+         PTDEBUG && _d($sql);
          $engine = $dbh->selectrow_hashref($sql)->{engine};
-         MKDEBUG && _d($tbl, 'uses', $engine, 'engine');
+         PTDEBUG && _d($tbl, 'uses', $engine, 'engine');
       }
 
 
@@ -3416,7 +3416,7 @@
       }
    }
 
-   MKDEBUG && _d('No more tables in database', $self->{db});
+   PTDEBUG && _d('No more tables in database', $self->{db});
    $self->{db}   = undef;
    $self->{tbls} = undef;
 
@@ -3432,30 +3432,30 @@
    my $filter = $self->{filters};
 
    if ( $db =~ m/information_schema|performance_schema|lost\+found/ ) {
-      MKDEBUG && _d('Database', $db, 'is a system database, ignoring');
+      PTDEBUG && _d('Database', $db, 'is a system database, ignoring');
       return 0;
    }
 
    if ( $self->{filters}->{'ignore-databases'}->{$db} ) {
-      MKDEBUG && _d('Database', $db, 'is in --ignore-databases list');
+      PTDEBUG && _d('Database', $db, 'is in --ignore-databases list');
       return 0;
    }
 
    if ( $filter->{'ignore-databases-regex'}
         && $db =~ $filter->{'ignore-databases-regex'} ) {
-      MKDEBUG && _d('Database', $db, 'matches --ignore-databases-regex');
+      PTDEBUG && _d('Database', $db, 'matches --ignore-databases-regex');
       return 0;
    }
 
    if ( $filter->{'databases'}
         && !$filter->{'databases'}->{$db} ) {
-      MKDEBUG && _d('Database', $db, 'is not in --databases list, ignoring');
+      PTDEBUG && _d('Database', $db, 'is not in --databases list, ignoring');
       return 0;
    }
 
    if ( $filter->{'databases-regex'}
         && $db !~ $filter->{'databases-regex'} ) {
-      MKDEBUG && _d('Database', $db, 'does not match --databases-regex, ignoring');
+      PTDEBUG && _d('Database', $db, 'does not match --databases-regex, ignoring');
       return 0;
    }
 
@@ -3475,25 +3475,25 @@
    if ( $filter->{'ignore-tables'}->{$tbl}
         && ($filter->{'ignore-tables'}->{$tbl} eq '*'
             || $filter->{'ignore-tables'}->{$tbl} eq $db) ) {
-      MKDEBUG && _d('Table', $tbl, 'is in --ignore-tables list');
+      PTDEBUG && _d('Table', $tbl, 'is in --ignore-tables list');
       return 0;
    }
 
    if ( $filter->{'ignore-tables-regex'}
         && $tbl =~ $filter->{'ignore-tables-regex'} ) {
-      MKDEBUG && _d('Table', $tbl, 'matches --ignore-tables-regex');
+      PTDEBUG && _d('Table', $tbl, 'matches --ignore-tables-regex');
       return 0;
    }
 
    if ( $filter->{'tables'}
         && !$filter->{'tables'}->{$tbl} ) { 
-      MKDEBUG && _d('Table', $tbl, 'is not in --tables list, ignoring');
+      PTDEBUG && _d('Table', $tbl, 'is not in --tables list, ignoring');
       return 0;
    }
 
    if ( $filter->{'tables-regex'}
         && $tbl !~ $filter->{'tables-regex'} ) {
-      MKDEBUG && _d('Table', $tbl, 'does not match --tables-regex, ignoring');
+      PTDEBUG && _d('Table', $tbl, 'does not match --tables-regex, ignoring');
       return 0;
    }
 
@@ -3501,7 +3501,7 @@
         && $filter->{'tables'}->{$tbl}
         && $filter->{'tables'}->{$tbl} ne '*'
         && $filter->{'tables'}->{$tbl} ne $db ) {
-      MKDEBUG && _d('Table', $tbl, 'is only allowed in database',
+      PTDEBUG && _d('Table', $tbl, 'is only allowed in database',
          $filter->{'tables'}->{$tbl});
       return 0;
    }
@@ -3518,13 +3518,13 @@
    my $filter = $self->{filters};
 
    if ( $filter->{'ignore-engines'}->{$engine} ) {
-      MKDEBUG && _d('Engine', $engine, 'is in --ignore-databases list');
+      PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list');
       return 0;
    }
 
    if ( $filter->{'engines'}
         && !$filter->{'engines'}->{$engine} ) {
-      MKDEBUG && _d('Engine', $engine, 'is not in --engines list, ignoring');
+      PTDEBUG && _d('Engine', $engine, 'is not in --engines list, ignoring');
       return 0;
    }
 
@@ -3558,7 +3558,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 
@@ -3662,7 +3662,7 @@
          print_all_keys($fks,  $tbl, \%seen_tbl) if $fks;
       }
       else {
-         MKDEBUG && _d('Getting duplicate keys on', $tbl->{db}, $tbl->{tbl});
+         PTDEBUG && _d('Getting duplicate keys on', $tbl->{db}, $tbl->{tbl});
          eval {
             if ( $keys ) {
                $dk->get_duplicate_keys(
@@ -3746,7 +3746,7 @@
    foreach my $arg ( qw(tbl_info dbh is_fk o ks q tp seen_tbl) ) {
       die "I need a $arg argument" unless exists $args{$arg};
    }
-   MKDEBUG && _d('Printing duplicate key', $dupe->{key});
+   PTDEBUG && _d('Printing duplicate key', $dupe->{key});
    my $db       = $args{tbl_info}->{db};
    my $tbl      = $args{tbl_info}->{tbl};
    my $dbh      = $args{dbh};
@@ -3776,7 +3776,7 @@
    my %seen;  # print each column only once
    foreach my $col ( @{$dupe->{cols}}, @{$dupe->{duplicate_of_cols}} ) {
       next if $seen{$col}++;
-      MKDEBUG && _d('col', $col);
+      PTDEBUG && _d('col', $col);
       print "#\t" . lc($struct->{defs}->{lc $col}) . "\n";
    }
 
@@ -4270,6 +4270,6 @@
 
 =head1 VERSION
 
-pt-duplicate-key-checker 1.0.1
+pt-duplicate-key-checker 1.0.2
 
 =cut

=== modified file 'bin/pt-fifo-split'
--- bin/pt-fifo-split	2011-09-01 16:00:38 +0000
+++ bin/pt-fifo-split	2011-12-29 16:12:24 +0000
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings FATAL => 'all';
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 # ###########################################################################
 # OptionParser package
@@ -22,7 +22,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use constant MKDEBUG => $ENV{MKDEBUG} || 0;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use List::Util qw(max);
 use Getopt::Long;
@@ -106,7 +106,7 @@
    my $contents = do { local $/ = undef; <$fh> };
    close $fh;
    if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      MKDEBUG && _d('Parsing DSN OPTIONS');
+      PTDEBUG && _d('Parsing DSN OPTIONS');
       my $dsn_attribs = {
          dsn  => 1,
          copy => 1,
@@ -150,7 +150,7 @@
 
    if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
       $self->{version} = $1;
-      MKDEBUG && _d($self->{version});
+      PTDEBUG && _d($self->{version});
    }
 
    return;
@@ -187,7 +187,7 @@
       chomp $para;
       $para =~ s/\s+/ /g;
       $para =~ s/$POD_link_re/$1/go;
-      MKDEBUG && _d('Option rule:', $para);
+      PTDEBUG && _d('Option rule:', $para);
       push @rules, $para;
    }
 
@@ -196,7 +196,7 @@
    do {
       if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
          chomp $para;
-         MKDEBUG && _d($para);
+         PTDEBUG && _d($para);
          my %attribs;
 
          $para = <$fh>; # read next paragraph, possibly attributes
@@ -215,7 +215,7 @@
             $para = <$fh>; # read next paragraph, probably short help desc
          }
          else {
-            MKDEBUG && _d('Option has no attributes');
+            PTDEBUG && _d('Option has no attributes');
          }
 
          $para =~ s/\s+\Z//g;
@@ -223,7 +223,7 @@
          $para =~ s/$POD_link_re/$1/go;
 
          $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         MKDEBUG && _d('Short help:', $para);
+         PTDEBUG && _d('Short help:', $para);
 
          die "No description after option spec $option" if $para =~ m/^=item/;
 
@@ -261,7 +261,7 @@
 
    foreach my $opt ( @specs ) {
       if ( ref $opt ) { # It's an option spec, not a rule.
-         MKDEBUG && _d('Parsing opt spec:',
+         PTDEBUG && _d('Parsing opt spec:',
             map { ($_, '=>', $opt->{$_}) } keys %$opt);
 
          my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
@@ -274,7 +274,7 @@
          $self->{opts}->{$long} = $opt;
 
          if ( length $long == 1 ) {
-            MKDEBUG && _d('Long opt', $long, 'looks like short opt');
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');