Updated version from build script

This field is not being used by any tool but it is needed to decode
bigger structures having it. Since the value can be an int to indicate
the number 1-primary, etc, or 'majority', I've changed the field type
from int to interface{}

Changelog

@@ -1,11 +1,16 @@
 Changelog for Percona Toolkit
 
- * Fixed bug   PT-1857: pt-heartbeat cannot reconnect. 
+ * Fixed bug   PT-716 : pt-summary reports wrong memory size
+ * Fixed bug   PT-1914: Column data lost when 'Generated' is in the column comment
+ * Fixed bug   PT-1919: pt-online-schema change drop_swap can lose triggers. (Thanks Bob)
+ * Fixed bug   PT-1943:	BEFORE triggers are dropped after pt-online-schema-change run
 
+v3.3.0 release 2021-01-14 
+
+ * Fixed bug   PT-1857: pt-heartbeat cannot reconnect. 
  * Fixed bug   PT-169 : pt-online-schema-change FKs error handling.
  * Fixed bug   PT-1892: pt-summary says sshd not running
  * Fixed bug   PT-1881: pt-upgrade fails when query including format strings and SQL errors is given (Thanks Nayuta Yanagisawa)
-
  * Fixed bug   PT-1859: pt-pg-summary fails for Postgres12 (Thanks Sergey Kuzmichev)
  * Improvement PT-1853: Added --no-check-foreing-keys to pt-osc
  * Improvement PT-1851: Backslashes missing from documentation

Makefile.PL

@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '3.3.0',
+    VERSION   => '3.3.1',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',

bin/pt-align

@@ -1359,6 +1359,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-align 3.3.0
+pt-align 3.3.1
 
 =cut

bin/pt-archiver

@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2018,9 +2018,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -8655,6 +8656,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-archiver 3.3.0
+pt-archiver 3.3.1
 
 =cut

bin/pt-config-diff

@@ -43,7 +43,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5912,6 +5912,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-config-diff 3.3.0
+pt-config-diff 3.3.1
 
 =cut

bin/pt-deadlock-logger

@@ -42,7 +42,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5702,6 +5702,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-deadlock-logger 3.3.0
+pt-deadlock-logger 3.3.1
 
 =cut

bin/pt-diskstats

@@ -38,7 +38,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -5677,6 +5677,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-diskstats 3.3.0
+pt-diskstats 3.3.1
 
 =cut

bin/pt-duplicate-key-checker

@@ -39,7 +39,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -405,9 +405,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -5765,6 +5766,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-duplicate-key-checker 3.3.0
+pt-duplicate-key-checker 3.3.1
 
 =cut

bin/pt-fifo-split

@@ -1648,6 +1648,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fifo-split 3.3.0
+pt-fifo-split 3.3.1
 
 =cut

bin/pt-find

@@ -35,7 +35,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -1955,9 +1955,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -5126,6 +5127,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-find 3.3.0
+pt-find 3.3.1
 
 =cut

bin/pt-fingerprint

@@ -2239,6 +2239,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fingerprint 3.3.0
+pt-fingerprint 3.3.1
 
 =cut

bin/pt-fk-error-logger

@@ -37,7 +37,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4688,6 +4688,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fk-error-logger 3.3.0
+pt-fk-error-logger 3.3.1
 
 =cut

bin/pt-heartbeat

@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3630,9 +3630,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -7385,6 +7386,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-heartbeat 3.3.0
+pt-heartbeat 3.3.1
 
 =cut

bin/pt-index-usage

@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3194,9 +3194,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -7695,6 +7696,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-index-usage 3.3.0
+pt-index-usage 3.3.1
 
 =cut

bin/pt-ioprofile

@@ -1127,7 +1127,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-ioprofile 3.3.0
+pt-ioprofile 3.3.1
 
 =cut
 

bin/pt-kill

@@ -47,7 +47,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3020,9 +3020,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -8554,6 +8555,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-kill 3.3.0
+pt-kill 3.3.1
 
 =cut

bin/pt-mext

@@ -804,7 +804,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mext 3.3.0
+pt-mext 3.3.1
 
 =cut
 

bin/pt-mysql-summary

@@ -3289,7 +3289,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mysql-summary 3.3.0
+pt-mysql-summary 3.3.1
 
 =cut
 

bin/pt-online-schema-change

@@ -56,7 +56,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3388,9 +3388,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g;
-   $string =~ s/[^\\]"[^"]*[^\\]"//g;
-   $string =~ s/[^\\]'[^']*[^\\]'//g;
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -10134,7 +10135,7 @@ sub main {
    }
 
    if ( $o->get('preserve-triggers') ) {
-      if ( !$o->get('swap-tables') && $o->get('drop-new-table') ) {
+       if ( !$o->get('swap-tables') && $o->get('drop-new-table') && !$o->get('alter-foreign-keys-method') eq "drop-swap" ) {
           print ts("Skipping triggers creation since --no-swap-tables was specified along with --drop-new-table\n");
       } else {
           print ts("Adding original triggers to new table.\n");
@@ -11218,8 +11219,12 @@ sub rebuild_constraints {
             tries   => $tries->{update_foreign_keys},
             stats   => $stats,
             code    => sub {
-               PTDEBUG && _d($sql);
+               PTDEBUG && _d("SET foreign_key_checks=0");
+               $cxn->dbh()->do("SET foreign_key_checks=0");
+	       PTDEBUG && _d($sql);
                $cxn->dbh()->do($sql);
+	       PTDEBUG && _d("SET foreign_key_checks=1");
+               $cxn->dbh()->do("SET foreign_key_checks=1");
                $stats->{rebuilt_constraint}++;
             },
          );
@@ -11403,6 +11408,15 @@ sub create_triggers {
           suffix => 'ins', event => 'INSERT', time => 'AFTER', orig_triggers => [],
           new_trigger_sql => $insert_trigger, new_trigger_name => "${prefix}_ins",
       },
+      {
+          event => 'DELETE', time => 'BEFORE', orig_triggers => [], 
+      },
+      {
+          event => 'UPDATE', time => 'BEFORE', orig_triggers => [], 
+      },
+      {
+          event => 'INSERT', time => 'BEFORE', orig_triggers => [], 
+      },
    ];
 
    $cxn->connect();
@@ -11461,6 +11475,7 @@ sub create_triggers {
    my @trigger_names;
 
    foreach my $trigger_info ( @$triggers_info ) {
+       next if ! ($trigger_info->{new_trigger_sql});  ###FIXED PT-1919
        if ($o->get('execute') && !$args{dont}) {
            osc_retry(
                Cxn     => $cxn,
@@ -12218,13 +12233,6 @@ abort, because the old table is gone permanently.
 
 This method forces C<--no-swap-tables> and C<--no-drop-old-table>.
 
-Check for self-referencing foreign keys. Currently self referencing FKs are not 
-fully supported, so, to prevent errors, this program won't run if the table has
-self-referencing foreign keys. Use this parameter to disable self-referencing FK checks.
-
-On tables having self refference FKs + triggers, C<--alter-foreign-keys-method drop_swap>
-will not work. Use other method like C<--alter-foreign-keys-method rebuild_constraints>.
-
 =item none
 
 This method is like C<drop_swap> without the "swap".  Any foreign keys that
@@ -13462,6 +13470,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-online-schema-change 3.3.0
+pt-online-schema-change 3.3.1
 
 =cut

bin/pt-pmp

@@ -896,7 +896,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-pmp 3.3.0
+pt-pmp 3.3.1
 
 =cut
 

bin/pt-query-digest

@@ -64,7 +64,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -8963,9 +8963,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -16957,6 +16958,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-query-digest 3.3.0
+pt-query-digest 3.3.1
 
 =cut

bin/pt-show-grants

@@ -2613,6 +2613,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-show-grants 3.3.0
+pt-show-grants 3.3.1
 
 =cut

bin/pt-sift

@@ -1245,7 +1245,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-sift 3.3.0
+pt-sift 3.3.1
 
 =cut
 

bin/pt-slave-delay

@@ -40,7 +40,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4988,6 +4988,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-delay 3.3.0
+pt-slave-delay 3.3.1
 
 =cut

bin/pt-slave-find

@@ -4523,6 +4523,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-find 3.3.0
+pt-slave-find 3.3.1
 
 =cut

bin/pt-slave-restart

@@ -41,7 +41,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6159,6 +6159,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-restart 3.3.0
+pt-slave-restart 3.3.1
 
 =cut

bin/pt-stalk

@@ -2419,7 +2419,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-stalk 3.3.0
+pt-stalk 3.3.1
 
 =cut
 

bin/pt-summary

@@ -1174,7 +1174,7 @@ find_memory_stats () { local PTFUNCNAME=find_memory_stats;
    local platform="$1"
 
    if [ "${platform}" = "Linux" ]; then
-      free -b
+      free -bw
       cat /proc/meminfo
    elif [ "${platform}" = "SunOS" ]; then
       $CMD_PRTCONF | awk -F: '/Memory/{print $2}'
@@ -2723,7 +2723,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-summary 3.3.0
+pt-summary 3.3.1
 
 =cut
 

bin/pt-table-checksum

@@ -58,7 +58,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4563,9 +4563,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g;
-   $string =~ s/[^\\]"[^"]*[^\\]"//g;
-   $string =~ s/[^\\]'[^']*[^\\]'//g;
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -14182,6 +14183,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-checksum 3.3.0
+pt-table-checksum 3.3.1
 
 =cut

bin/pt-table-sync

@@ -55,7 +55,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -2939,9 +2939,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -13083,6 +13084,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-sync 3.3.0
+pt-table-sync 3.3.1
 
 =cut

bin/pt-table-usage

@@ -6870,9 +6870,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 
@@ -8509,6 +8510,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-usage 3.3.0
+pt-table-usage 3.3.1
 
 =cut

bin/pt-upgrade

@@ -61,7 +61,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -11444,6 +11444,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-upgrade 3.3.0
+pt-upgrade 3.3.1
 
 =cut

bin/pt-variable-advisor

@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';
@@ -6257,6 +6257,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-variable-advisor 3.3.0
+pt-variable-advisor 3.3.1
 
 =cut

bin/pt-visual-explain

@@ -3303,6 +3303,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-visual-explain 3.3.0
+pt-visual-explain 3.3.1
 
 =cut

config/sphinx-build/conf.py

@@ -50,7 +50,7 @@ copyright = u'2021, Percona LLC and/or its affiliates'
 # The short X.Y version.
 version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '3.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/percona-toolkit.pod

@@ -567,6 +567,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-Percona Toolkit v3.3.0 released 2021-01-13
+Percona Toolkit v3.3.1 released 2021-04-22
 
 =cut

lib/Percona/Toolkit.pm

@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;
 
-our $VERSION = '3.3.0';
+our $VERSION = '3.3.1';
 
 use strict;
 use warnings FATAL => 'all';

lib/TableParser.pm

@@ -218,9 +218,10 @@ sub parse {
 
 sub remove_quoted_text {
    my ($string) = @_;
-   $string =~ s/[^\\]`[^`]*[^\\]`//g; 
-   $string =~ s/[^\\]"[^"]*[^\\]"//g; 
-   $string =~ s/[^\\]'[^']*[^\\]'//g; 
+   $string =~ s/\\['"]//g;
+   $string =~ s/`[^`]*?`//g; 
+   $string =~ s/"[^"]*?"//g; 
+   $string =~ s/'[^']*?'//g; 
    return $string;
 }
 

src/go/mongolib/proto/replstatus.go

@@ -75,8 +75,8 @@ type RSConfig struct {
 }
 
 type LastErrorDefaults struct {
-	W        int32 `bson:"w"`
-	WTimeout int32 `bson:"wtimeout"`
+	W        interface{} `bson:"w"`
+	WTimeout int32       `bson:"wtimeout"`
 }
 
 type RSSettings struct {

src/go/pt-mongodb-query-digest/main.go

@@ -40,7 +40,7 @@ const (
 var (
 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.2.0"      //nolint
+	Version   string = "3.3.1"      //nolint
 	Commit    string                //nolint
 )
 

src/go/pt-mongodb-summary/main.go

@@ -56,7 +56,7 @@ const (
 var (
 	Build     string = "2020-04-23"
 	GoVersion string = "1.14.1"
-	Version   string = "3.2.0"
+	Version   string = "3.3.1"
 	Commit    string
 
 	defaultConnectionTimeout = 3 * time.Second

src/go/pt-pg-summary/main.go

@@ -21,7 +21,7 @@ var (
 	Build     string = "2020-04-23" //nolint
 	Commit    string                //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.2.0"      //nolint
+	Version   string = "3.3.1"      //nolint
 )
 
 type connOpts struct {

src/go/pt-secure-collect/main.go

@@ -86,7 +86,7 @@ var (
 
 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.2.0"      //nolint
+	Version   string = "3.3.1"      //nolint
 	Commit    string                //nolint
 )
 

t/lib/TableParser.t

@@ -1267,6 +1267,68 @@ is_deeply(
    'Column having the word "generated" as part of the comment is OK',
 ) or diag Data::Dumper::Dumper($tbl);
 
+$tbl = $tp->parse( load_file('t/lib/samples/generated_cols_comments_2.sql') );
+is_deeply(
+    $tbl,
+    {
+        charset => 'latin1',
+        clustered_key => undef,
+        col_posn => {
+            c => 1,
+            id => 0,
+            v => 2
+        },
+        cols => [
+            'id',
+            'c',
+            'v'
+        ],
+        defs => {
+            c => ' `c` varchar(100) NOT NULL DEFAULT \'\' COMMENT \'Generated\'',
+            id => ' `id` int(11) NOT NULL',
+            v => ' `v` int(11) DEFAULT NULL'
+        },
+        engine => 'InnoDB',
+        is_autoinc => {
+            c => 0,
+            id => 0,
+            v => 0
+        },
+        is_col => {
+            c => 1,
+            id => 1,
+            v => 1
+        },
+        is_generated => {},
+        is_nullable => {
+            v => 1
+        },
+        is_numeric => {
+            id => 1,
+            v => 1
+        },
+        keys => {},
+        name => 't',
+        non_generated_cols => [
+            'id',
+            'c',
+            'v'
+        ],
+        null_cols => [
+            'v'
+        ],
+        numeric_cols => [
+            'id',
+            'v'
+        ],
+        type_for => {
+            c => 'varchar',
+            id => 'int',
+            v => 'int'
+        }
+    },
+    'Column having the word "generated" as part of the comment is OK',
+) or diag Data::Dumper::Dumper($tbl);
 # #############################################################################
 # Done.
 # #############################################################################

t/lib/samples/generated_cols_comments_2.sql

@@ -0,0 +1,6 @@
+Create Table: CREATE TABLE `t` (
+ `id` int(11) NOT NULL,
+ `c` varchar(100) NOT NULL DEFAULT '' COMMENT 'Generated',
+ `v` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;

t/pt-online-schema-change/pt-1914.t

@@ -0,0 +1,337 @@
+#!/usr/bin/env perl
+
+BEGIN {
+    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+    unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+    unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+use Time::HiRes qw(sleep);
+
+$ENV{PTTEST_FAKE_TS} = 1;
+$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-online-schema-change";
+require VersionParser;
+
+use Data::Dumper;
+$Data::Dumper::Indent    = 1;
+$Data::Dumper::Sortkeys  = 1;
+$Data::Dumper::Quotekeys = 0;
+
+my $dp         = new DSNParser(opts=>$dsn_opts);
+my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master');
+my $slave_dbh  = $sb->get_dbh_for('slave1');
+
+if ( !$master_dbh ) {
+    plan skip_all => 'Cannot connect to sandbox master';
+}
+elsif ( !$slave_dbh ) {
+    plan skip_all => 'Cannot connect to sandbox slave';
+}
+
+my $q      = new Quoter();
+my $tp     = new TableParser(Quoter => $q);
+my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
+my $output = "";
+my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
+my $exit   = 0;
+my $sample = "t/pt-online-schema-change/samples";
+my $rows;
+
+# #############################################################################
+# A helper sub to do the heavy lifting for us.
+# #############################################################################
+
+sub test_alter_table {
+    my (%args) = @_;
+    return if $args{skip};
+
+    my @required_args = qw(name table test_type cmds);
+    foreach my $arg ( @required_args ) {
+        die "I need a $arg argument" unless $args{$arg};
+    }
+    my ($name, $table, $test_type, $cmds) = @args{@required_args};
+
+    my ($db, $tbl) = $q->split_unquote($table);
+    my $table_name = $tbl;
+    my $pk_col     = $args{pk_col} || 'id';
+    my $delete_triggers = $args{delete_triggers} || '';
+
+    if ( my $file = $args{file} ) {
+        $sb->load_file('master', "$sample/$file");
+        $master_dbh->do("USE `$db`");
+        $slave_dbh->do("USE `$db`");
+    }
+
+    my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+    my $tbl_struct = $tp->parse($ddl);
+
+    my $cols = '*';
+    if ( $test_type =~ m/(?:add|drop)_col/  && !grep { $_ eq '--dry-run' } @$cmds ) {
+        # Don't select the column being dropped.
+        my $col = $args{drop_col} || $args{new_col};
+        die "I need a drop_col argument" unless $col;
+        $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
+    }
+    my $orig_rows = $master_dbh->selectall_arrayref(
+        "SELECT $cols FROM $table ORDER BY `$pk_col`");
+
+    my $orig_tbls = $master_dbh->selectall_arrayref(
+        "SHOW TABLES FROM `$db`");
+
+    my $orig_max_id = $master_dbh->selectall_arrayref(
+        "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
+
+    my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
+    . "       CHARACTER_SET_CLIENT, COLLATION_CONNECTION, EVENT_MANIPULATION, ACTION_TIMING "
+    . "  FROM INFORMATION_SCHEMA.TRIGGERS "
+    . " WHERE TRIGGER_SCHEMA = '$db' " 
+    .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
+
+
+    my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+
+    my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
+
+    my $fk_method = $args{check_fks};
+    my @orig_fks;
+    if ( $fk_method ) {
+        foreach my $tbl ( @$orig_tbls ) {
+            my $fks = $tp->get_fks(
+                $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            push @orig_fks, $fks;
+        }
+    }
+
+    # If --no-drop-new-table is given, then the new, altered table
+    # should still exist, but not yet, so add it to the list so
+    # is_deeply() against $new_tbls passes.  This only works for
+    # single-table tests.
+    my $new_tbl = $args{new_table} || "_${tbl}_new";
+    if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
+        unshift @$orig_tbls, [$new_tbl];
+    }
+
+    ($output, $exit) = full_output(
+        sub { pt_online_schema_change::main(
+                @args,
+                '--print',
+                "$dsn,D=$db,t=$tbl",
+                @$cmds,
+            )},
+        stderr => 1,
+    );
+
+    my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+    my $new_tbl_struct = $tp->parse($new_ddl);
+    my $fail    = 0;
+
+    is(
+        $exit,
+        0,
+        "$name exit 0"
+    ) or $fail = 1;
+
+    # There should be no new or missing tables.
+    my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+    is_deeply(
+        $new_tbls,
+        $orig_tbls,
+        "$name tables"
+    ) or $fail = 1;
+
+    # Rows in the original and new table should be identical.
+    my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+    is_deeply(
+        $new_rows,
+        $orig_rows,
+        "$name rows"
+    ) or $fail = 1;
+
+    if ( grep { $_ eq '--preserve-triggers' } @$cmds && !$delete_triggers) {
+        my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+        is_deeply(
+            $new_triggers,
+            $orig_triggers,
+            "$name triggers still exist"
+        ) or $fail = 1;
+    }
+
+    if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
+        $new_rows = $master_dbh->selectall_arrayref(
+            "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
+        is_deeply(
+            $new_rows,
+            $orig_rows,
+            "$name new table rows"
+        ) or $fail = 1;
+    }
+
+    my $new_max_id = $master_dbh->selectall_arrayref(
+        "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
+    is(
+        $orig_max_id->[0]->[0],
+        $new_max_id->[0]->[0],
+        "$name MAX(pk_col)"
+    ) or $fail = 1;
+
+    my ($new_auto_inc) = $new_ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
+    is(
+        $orig_auto_inc,
+        $new_auto_inc,
+        "$name AUTO_INCREMENT=" . ($orig_auto_inc || '<unknown>')
+    ) or $fail = 1;
+
+    # Check if the ALTER was actually done.
+    if ( $test_type eq 'drop_col' ) {
+        my $col = $q->quote($args{drop_col});
+
+        if ( grep { $_ eq '--dry-run' } @$cmds ) {
+            like(
+                $new_ddl,
+                qr/^\s+$col\s+/m,
+                "$name ALTER DROP COLUMN=$args{drop_col} (dry run)"
+            ) or $fail = 1;
+        }
+        else {
+            unlike(
+                $new_ddl,
+                qr/^\s+$col\s+/m,
+                "$name ALTER DROP COLUMN=$args{drop_col}"
+            ) or $fail = 1;
+        }
+    }
+    elsif ( $test_type eq 'add_col' ) {
+        if ( $args{no_change} ) {
+            ok(
+                !$new_tbl_struct->{is_col}->{$args{new_col}},
+                "$name $args{new_col} not added"
+            );
+        }
+        else {
+            ok(
+                $new_tbl_struct->{is_col}->{$args{new_col}},
+                "$name $args{new_col} added"
+            );
+        }
+    }
+    elsif ( $test_type eq 'new_engine' ) {
+        my $new_engine = lc($args{new_engine});
+        die "I need a new_engine argument" unless $new_engine;
+        my $rows = $master_dbh->selectall_hashref(
+            "SHOW TABLE STATUS FROM `$db`", "name");
+        is(
+            lc($rows->{$tbl}->{engine}),
+            $new_engine,
+            "$name ALTER ENGINE=$args{new_engine}"
+        ) or $fail = 1;
+
+    }
+
+    if ( $fk_method ) {
+        my @new_fks;
+        my $rebuild_method = 0;
+
+        foreach my $tbl ( @$orig_tbls ) {
+            my $fks = $tp->get_fks(
+                $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+
+            # The tool does not use the same/original fk name,
+            # it appends a single _.  So we need to strip this
+            # to compare the original fks to the new fks.
+            # if ( $fk_method eq 'rebuild_constraints' ) {
+            if ( $fk_method eq 'rebuild_constraints'
+                || $table_name eq $tbl->[0] ) {
+                my %new_fks = map {
+                    my $real_fk_name = $_;
+                    my $fk_name      = $_;
+                    if ( $fk_name =~ s/^_// && $table_name ne $tbl->[0] ) {
+                        $rebuild_method = 1;
+                    }
+                    $fks->{$real_fk_name}->{name} =~ s/^_//;
+                    $fks->{$real_fk_name}->{ddl}  =~ s/`$real_fk_name`/`$fk_name`/;
+                    $fk_name => $fks->{$real_fk_name};
+                } keys %$fks;
+                push @new_fks, \%new_fks;
+            }
+            else {
+                # drop_swap
+                push @new_fks, $fks;
+            }
+        }
+
+        if ( grep { $_ eq '--execute' } @$cmds ) {
+            ok(
+                $fk_method eq 'rebuild_constraints' &&  $rebuild_method ? 1
+                : $fk_method eq 'drop_swap'           && !$rebuild_method ? 1
+                :                                                           0,
+                "$name FK $fk_method method"
+            );
+        }
+    }
+
+    if ( $fail ) {
+        diag("Output from failed test:\n$output");
+    }
+    elsif ( $args{output} ) {
+        warn $output;
+    }
+
+    my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+    is_deeply(
+        $orig_triggers,
+        $new_triggers,
+        'Triggers should remain in place',
+    );
+
+    return;
+}
+
+test_alter_table(
+    name        => "Basic FK auto --execute",
+    table       => "test.aaa",
+    pk_col      => "id",
+    file        => "pt-1914.sql",
+    test_type   => "add_col",
+    new_col     => "last_update",
+    check_fks   => "drop_swap",
+    cmds        => [
+        qw(
+        --execute --statistics --print
+        --alter-foreign-keys-method drop_swap 
+        --preserve-triggers
+        ),
+        '--alter', 'ADD COLUMN last_update DATE',
+    ],
+);
+
+$rows = $master_dbh->selectall_arrayref( "SELECT * FROM test.aaa");
+my $want = [
+    [ 1, 'a', 1, undef ],
+    [ 2, 'b', 2, undef ],
+    [ 3, 'c', undef, undef ],
+    [ 4, 'd', 4, undef ],
+    [ 5, 'e', undef, undef ],
+    [ 6, 'f', 6, undef ]
+];
+
+is_deeply(
+    $rows,
+    $want,
+    'Row values in generated column remain intact',
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

t/pt-online-schema-change/pt-1919.t

@@ -0,0 +1,348 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+use Time::HiRes qw(sleep);
+
+$ENV{PTTEST_FAKE_TS} = 1;
+$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-online-schema-change";
+require VersionParser;
+
+use Data::Dumper;
+$Data::Dumper::Indent    = 1;
+$Data::Dumper::Sortkeys  = 1;
+$Data::Dumper::Quotekeys = 0;
+
+my $dp         = new DSNParser(opts=>$dsn_opts);
+my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master');
+my $slave_dbh  = $sb->get_dbh_for('slave1');
+
+if ( !$master_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master';
+}
+elsif ( !$slave_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave';
+}
+
+my $q      = new Quoter();
+my $tp     = new TableParser(Quoter => $q);
+my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
+my $output = "";
+my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
+my $exit   = 0;
+my $sample = "t/pt-online-schema-change/samples";
+my $rows;
+
+# #############################################################################
+# A helper sub to do the heavy lifting for us.
+# #############################################################################
+
+sub test_alter_table {
+   my (%args) = @_;
+   return if $args{skip};
+
+   my @required_args = qw(name table test_type cmds);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($name, $table, $test_type, $cmds) = @args{@required_args};
+
+   my ($db, $tbl) = $q->split_unquote($table);
+   my $table_name = $tbl;
+   my $pk_col     = $args{pk_col} || 'id';
+   my $delete_triggers = $args{delete_triggers} || '';
+
+   if ( my $file = $args{file} ) {
+      $sb->load_file('master', "$sample/$file");
+      $master_dbh->do("USE `$db`");
+      $slave_dbh->do("USE `$db`");
+   }
+
+   my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $tbl_struct = $tp->parse($ddl);
+
+   my $cols = '*';
+   if ( $test_type =~ m/(?:add|drop)_col/  && !grep { $_ eq '--dry-run' } @$cmds ) {
+      # Don't select the column being dropped.
+      my $col = $args{drop_col} || $args{new_col};
+      die "I need a drop_col argument" unless $col;
+      $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
+   }
+   my $orig_rows = $master_dbh->selectall_arrayref(
+      "SELECT $cols FROM $table ORDER BY `$pk_col`");
+
+   my $orig_tbls = $master_dbh->selectall_arrayref(
+      "SHOW TABLES FROM `$db`");
+
+   my $orig_max_id = $master_dbh->selectall_arrayref(
+      "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
+
+   my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
+                    . "       CHARACTER_SET_CLIENT, COLLATION_CONNECTION, EVENT_MANIPULATION, ACTION_TIMING "
+                    . "  FROM INFORMATION_SCHEMA.TRIGGERS "
+                    . " WHERE TRIGGER_SCHEMA = '$db' " 
+                    .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
+
+
+   my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+
+   my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
+
+   my $fk_method = $args{check_fks};
+   my @orig_fks;
+   if ( $fk_method ) {
+      foreach my $tbl ( @$orig_tbls ) {
+         my $fks = $tp->get_fks(
+            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+         push @orig_fks, $fks;
+      }
+   }
+
+   # If --no-drop-new-table is given, then the new, altered table
+   # should still exist, but not yet, so add it to the list so
+   # is_deeply() against $new_tbls passes.  This only works for
+   # single-table tests.
+   my $new_tbl = $args{new_table} || "_${tbl}_new";
+   if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
+      unshift @$orig_tbls, [$new_tbl];
+   }
+
+   ($output, $exit) = full_output(
+      sub { pt_online_schema_change::main(
+         @args,
+         '--print',
+         "$dsn,D=$db,t=$tbl",
+         @$cmds,
+      )},
+      stderr => 1,
+   );
+
+   my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $new_tbl_struct = $tp->parse($new_ddl);
+   my $fail    = 0;
+
+   is(
+      $exit,
+      0,
+      "$name exit 0"
+   ) or $fail = 1;
+
+   # There should be no new or missing tables.
+   my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+   is_deeply(
+      $new_tbls,
+      $orig_tbls,
+      "$name tables"
+   ) or $fail = 1;
+
+   # Rows in the original and new table should be identical.
+   my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+   is_deeply(
+      $new_rows,
+      $orig_rows,
+      "$name rows"
+   ) or $fail = 1;
+
+   if ( grep { $_ eq '--preserve-triggers' } @$cmds && !$delete_triggers) {
+      my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+      is_deeply(
+         $new_triggers,
+         $orig_triggers,
+         "$name triggers still exist"
+      ) or $fail = 1;
+   }
+
+   if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
+      $new_rows = $master_dbh->selectall_arrayref(
+         "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
+      is_deeply(
+         $new_rows,
+         $orig_rows,
+         "$name new table rows"
+      ) or $fail = 1;
+   }
+
+   my $new_max_id = $master_dbh->selectall_arrayref(
+      "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
+   is(
+      $orig_max_id->[0]->[0],
+      $new_max_id->[0]->[0],
+      "$name MAX(pk_col)"
+   ) or $fail = 1;
+
+   my ($new_auto_inc) = $new_ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
+   is(
+      $orig_auto_inc,
+      $new_auto_inc,
+      "$name AUTO_INCREMENT=" . ($orig_auto_inc || '<unknown>')
+   ) or $fail = 1;
+
+   # Check if the ALTER was actually done.
+   if ( $test_type eq 'drop_col' ) {
+      my $col = $q->quote($args{drop_col});
+
+      if ( grep { $_ eq '--dry-run' } @$cmds ) {
+         like(
+            $new_ddl,
+            qr/^\s+$col\s+/m,
+            "$name ALTER DROP COLUMN=$args{drop_col} (dry run)"
+         ) or $fail = 1;
+      }
+      else {
+         unlike(
+            $new_ddl,
+            qr/^\s+$col\s+/m,
+            "$name ALTER DROP COLUMN=$args{drop_col}"
+         ) or $fail = 1;
+      }
+   }
+   elsif ( $test_type eq 'add_col' ) {
+      if ( $args{no_change} ) {
+         ok(
+            !$new_tbl_struct->{is_col}->{$args{new_col}},
+            "$name $args{new_col} not added"
+         );
+      }
+      else {
+         ok(
+            $new_tbl_struct->{is_col}->{$args{new_col}},
+            "$name $args{new_col} added"
+         );
+      }
+   }
+   elsif ( $test_type eq 'new_engine' ) {
+      my $new_engine = lc($args{new_engine});
+      die "I need a new_engine argument" unless $new_engine;
+      my $rows = $master_dbh->selectall_hashref(
+         "SHOW TABLE STATUS FROM `$db`", "name");
+      is(
+         lc($rows->{$tbl}->{engine}),
+         $new_engine,
+         "$name ALTER ENGINE=$args{new_engine}"
+      ) or $fail = 1;
+
+   }
+ 
+   if ( $fk_method ) {
+      my @new_fks;
+      my $rebuild_method = 0;
+
+      foreach my $tbl ( @$orig_tbls ) {
+         my $fks = $tp->get_fks(
+            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+
+         # The tool does not use the same/original fk name,
+         # it appends a single _.  So we need to strip this
+         # to compare the original fks to the new fks.
+         # if ( $fk_method eq 'rebuild_constraints' ) {
+         if ( $fk_method eq 'rebuild_constraints'
+               || $table_name eq $tbl->[0] ) {
+            my %new_fks = map {
+               my $real_fk_name = $_;
+               my $fk_name      = $_;
+               if ( $fk_name =~ s/^_// && $table_name ne $tbl->[0] ) {
+                  $rebuild_method = 1;
+               }
+               $fks->{$real_fk_name}->{name} =~ s/^_//;
+               $fks->{$real_fk_name}->{ddl}  =~ s/`$real_fk_name`/`$fk_name`/;
+               $fk_name => $fks->{$real_fk_name};
+            } keys %$fks;
+            push @new_fks, \%new_fks;
+         }
+         else {
+            # drop_swap
+            push @new_fks, $fks;
+         }
+      }
+
+      if ( grep { $_ eq '--execute' } @$cmds ) {
+         ok(
+              $fk_method eq 'rebuild_constraints' &&  $rebuild_method ? 1
+            : $fk_method eq 'drop_swap'           && !$rebuild_method ? 1
+            :                                                           0,
+            "$name FK $fk_method method"
+         );
+      }
+
+      is_deeply(
+         \@new_fks,
+         \@orig_fks,
+         "$name FK constraints"
+      ) or $fail = 1;
+
+      # Go that extra mile and verify that the fks are actually
+      # still functiona: i.e. that they'll prevent us from delete
+      # a parent row that's being referenced by a child.
+      my $sql = "DELETE FROM $table WHERE $pk_col=1 LIMIT 1";
+      eval {
+         $master_dbh->do($sql);
+      };
+      like(
+         $EVAL_ERROR,
+         qr/foreign key constraint fails/,
+         "$name FK constraints still hold"
+      ) or $fail = 1;
+   }
+
+   if ( $fail ) {
+      diag("Output from failed test:\n$output");
+   }
+   elsif ( $args{output} ) {
+      warn $output;
+   }
+
+   my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+   is_deeply(
+       $orig_triggers,
+       $new_triggers,
+       'Triggers should remain in place',
+   );
+
+   return;
+}
+
+SKIP: {
+    skip 'Sandbox MySQL version should be >= 5.7' unless $sandbox_version ge '5.7';
+
+    $sb->load_file('master', "$sample/pt-1919.sql");
+
+    test_alter_table(
+        name        => "Basic FK auto --execute",
+        table       => "test.aaa",
+        pk_col      => "id",
+        file        => "pt-1919.sql",
+        test_type   => "add_col",
+        new_col     => "last_update",
+        check_fks   => "drop_swap",
+        cmds        => [
+            qw(
+            --execute --statistics --print
+            --alter-foreign-keys-method drop_swap 
+            --preserve-triggers
+            ),
+            '--alter', 'ADD COLUMN last_update DATE',
+        ],
+    );
+
+}
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+#
+done_testing;

t/pt-online-schema-change/samples/pt-1914.sql

@@ -0,0 +1,18 @@
+DROP DATABASE IF EXISTS test;
+CREATE DATABASE test;
+USE test;
+
+CREATE TABLE `aaa` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `Password` varchar(100) NOT NULL DEFAULT '' COMMENT 'Generated',
+ `v` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+
+INSERT INTO test.aaa VALUES 
+(1, "a", 1), 
+(2, "b", 2), 
+(3, "c", NULL),
+(4, "d", 4),
+(5, "e", NULL), 
+(6, "f", 6);

t/pt-online-schema-change/samples/pt-1919.sql

@@ -0,0 +1,39 @@
+DROP DATABASE IF EXISTS test;
+CREATE DATABASE test;
+USE test;
+
+CREATE TABLE aaa (
+  id int NOT NULL AUTO_INCREMENT,
+  a int DEFAULT 0,
+  b int DEFAULT 0,
+  x int DEFAULT 0,
+  z int DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+
+CREATE TABLE bbb (
+  id int NOT NULL AUTO_INCREMENT,
+  aaa_id int DEFAULT NULL,
+  c int DEFAULT 0,
+  d int DEFAULT 0,
+  x int DEFAULT 0,
+  modification_date datetime(3),
+  PRIMARY KEY (`id`),
+  CONSTRAINT `FK_aaa_id` FOREIGN KEY (`aaa_id`) REFERENCES aaa (`id`) 
+);
+
+CREATE TRIGGER before_aaa_upd1 BEFORE UPDATE ON aaa FOR EACH ROW set new.a = old.a+1;
+CREATE TRIGGER before_aaa_upd2 BEFORE UPDATE ON aaa FOR EACH ROW set new.b = old.b+1;
+CREATE TRIGGER after_aaa_upd3 AFTER UPDATE ON aaa FOR EACH ROW update bbb set c = c+1 WHERE aaa_id = NEW.id;
+CREATE TRIGGER after_aaa_upd4 AFTER UPDATE ON aaa FOR EACH ROW update bbb set d = d+1 WHERE aaa_id = NEW.id;
+
+DELIMITER $$
+CREATE TRIGGER before_aaa_upd5 BEFORE UPDATE ON aaa FOR EACH ROW 	BEGIN UPDATE bbb SET modification_date = UTC_TIMESTAMP(3) WHERE aaa_id = NEW.id; END;
+$$
+CREATE TRIGGER after_aaa_upd6 AFTER UPDATE ON aaa FOR EACH ROW 	BEGIN UPDATE bbb SET x = x+1 WHERE aaa_id = NEW.id; END;
+$$
+DELIMITER ;
+
+INSERT INTO aaa (x) VALUES (10),(20),(30),(40),(50);
+INSERT INTO bbb (aaa_id) VALUES (1), (2), (3), (3);
+-- UPDATE aaa SET z=id-1 WHERE id=2;

t/pt-online-schema-change/slave_lag.t

@@ -22,8 +22,8 @@ use File::Temp qw/ tempdir tempfile /;
 if ($ENV{PERCONA_SLOW_BOX}) {
     plan skip_all => 'This test needs a fast machine';
 } else {
-    plan tests => 6;
-    #plan skip_all => 'This test is taking too much time even in fast machines';
+    #plan tests => 6;
+    plan skip_all => 'This test is taking too much time even in fast machines';
 }                                  
 
 our $delay = 30;