Update PT version to 3.2

This reverts commit 25b637d4bd, reversing
changes made to 38c169031e.

Changelog

@@ -1,7 +1,18 @@
 Changelog for Percona Toolkit
 
- * Fixed bug   PT-1759: pt-stalk not collecting processlist and variables
+ * Fixed bug   PT-1824: Name of a constraint can exceed 64 chars
  * Fixed bug   PT-1793: Protocol parser cannot handle year 2020 (Thanks Kei Tsuchiya)
+ * Fixed bug   PT-1782: pt-online-schema-change: FK keys warning, but there are no foreign keys
+ * Fixed bug   PT-1773: pt-online-schema-change: Restrict the FK check if needed
+ * Fixed bug   PT-1766: pt-table-checksum: DIFF_ROWS is not computed correctly
+ * Improvement PT-1765: Documentation for pt-table-checksum's DIFF_ROWS
+ * Fixed bug   PT-1760: pt-online-schema-change: regression on slave with replication channels
+ * Fixed bug   PT-1759: pt-stalk not collecting processlist and variables
+ * Improvement PT-1757: pt-table-checksum: Improvement on handling Small Tables
+ * Improvement PT-1707: IPv6 support
+ * Fixed bug   PT-1576: pt-stalk mysql-only not working as expected
+ * Fixed bug   PT-1502: pt-online-schema-change not working with multi-source replication
+ * Fixed bug   PT-297 : pt-online-schema-change can break replication
 
  v3.1.0 release 2019-09-12
 

bin/pt-archiver

@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-config-diff

@@ -43,7 +43,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-deadlock-logger

@@ -42,7 +42,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-diskstats

@@ -38,7 +38,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-duplicate-key-checker

@@ -39,7 +39,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-find

@@ -35,7 +35,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-fk-error-logger

@@ -37,7 +37,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-heartbeat

@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-index-usage

@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-kill

@@ -47,7 +47,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-query-digest

@@ -64,7 +64,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-slave-delay

@@ -40,7 +40,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-slave-restart

@@ -41,7 +41,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-table-checksum

@@ -58,7 +58,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-table-sync

@@ -55,7 +55,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-upgrade

@@ -61,7 +61,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

bin/pt-variable-advisor

@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;
 
-our $VERSION = '3.0.14-dev';
+our $VERSION = '3.2.0';
 
 use strict;
 use warnings FATAL => 'all';

lib/Percona/Toolkit.pm

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

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

@@ -51,6 +51,7 @@ ok(
 );
 
 SKIP: {
+    skip "Skipping in MySQL 8.0.4-rc since there is an error in the server itself. See https://bugs.mysql.com/bug.php?id=89441", 9 if ($sandbox_version ge '8.0');
     ($output, $exit_status) = full_output(
        sub { pt_online_schema_change::main(@args,
           "$master_dsn,D=issue26211,t=process_model_inst",

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

@@ -23,6 +23,10 @@ my $master_dbh = $sb->get_dbh_for('master');
 
 my $vp = VersionParser->new($master_dbh);
 
+if ($vp->cmp('8.0.14') > -1 && $vp->flavor() !~ m/maria/i) {
+   plan skip_all => 'Cannot run this test under the current MySQL version';
+}
+
 if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }

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

@@ -32,7 +32,6 @@ my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
 my $output;
 my $exit_status;
-my $sample  = "t/pt-online-schema-change/samples/";
 
 # ############################################################################
 # https://bugs.launchpad.net/percona-toolkit/+bug/1632522
@@ -40,7 +39,7 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # ############################################################################
 
 diag("Before loading sql");
-$sb->load_file('master', "$sample/bug-1632522.sql");
+$sb->load_file('master', "t/pt-online-schema-change/samples/bug-1632522.sql");
 diag("after loading sql");
 
 # run once: we expect the constraint name to be appended with one underscore
@@ -52,14 +51,22 @@ diag("after loading sql");
       qw(--execute)) },
 );
 
-my $constraints = $master_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1632522' and (TABLE_NAME='test_table' OR TABLE_NAME='person') and CONSTRAINT_NAME LIKE '%fk_%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
+my $query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     AND (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     AND CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+my $constraints = $master_dbh->selectall_arrayref($query);
 
 is_deeply(
    $constraints,
    [
       ['person', '_fk_testId'],
-      ['test_table', 'fk_person'],
-      ['test_table', 'fk_refId'],
+      ['test_table', '_fk_person'],
+      ['test_table', '__fk_refId'],
    ],
    "First run adds or removes underscore from constraint names, accordingly"
 );
@@ -73,15 +80,23 @@ is_deeply(
       qw(--execute)) },
 );
 
-$constraints = $master_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1632522' and (TABLE_NAME='test_table' OR TABLE_NAME='person') and CONSTRAINT_NAME LIKE '%fk_%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
+$query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     AND (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     AND CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+$constraints = $master_dbh->selectall_arrayref($query);
 
 
 is_deeply(
    $constraints,
    [
-      ['person', '_fk_testId'],
-      ['test_table', 'fk_person'],
-      ['test_table', 'fk_refId'],
+      ['person', '__fk_testId'],
+      ['test_table', '_fk_refId'],
+      ['test_table', '__fk_person'],
    ],
    "Second run self-referencing will be one due to rebuild_constraints"
 );
@@ -94,13 +109,21 @@ is_deeply(
       qw(--execute)) },
 );
 
-$constraints = $master_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1632522' and (TABLE_NAME='test_table' OR TABLE_NAME='person') and CONSTRAINT_NAME LIKE '%fk_%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
+$query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     and (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     and CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+$constraints = $master_dbh->selectall_arrayref($query);
 
 
 is_deeply(
    $constraints,
    [
-      ['person', '_fk_testId'],
+      ['person', 'fk_testId'],
       ['test_table', 'fk_person'],
       ['test_table', 'fk_refId'],
    ],

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

@@ -0,0 +1,138 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+
+use Data::Dumper;
+use PerconaTest;
+use Sandbox;
+
+require "$trunk/bin/pt-online-schema-change";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('master');
+
+if ( !$master_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master';
+}
+
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --set-vars innodb_lock_wait_timeout-3 else the
+# tool will die.
+my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
+my $output;
+my $exit_status;
+
+# ############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1632522
+# pt-online-schema-change fails with duplicate key in table for self-referencing FK
+# ############################################################################
+
+diag("Before loading sql");
+$sb->load_file('master', "t/pt-online-schema-change/samples/bug-1632522.sql");
+diag("after loading sql");
+
+# run once: we expect the constraint name to be appended with one underscore
+# but the self-referencing constraint will have 2 underscore
+($output, $exit_status) = full_output(
+   sub { pt_online_schema_change::main(@args,
+      "$master_dsn,D=bug1632522,t=test_table",
+      "--alter", "ENGINE=InnoDB",
+      qw(--execute)) },
+);
+
+my $query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     AND (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     AND CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+my $constraints = $master_dbh->selectall_arrayref($query);
+
+is_deeply(
+   $constraints,
+   [
+      ['person', '_fk_testId'],
+      ['test_table', '_fk_person'],
+      ['test_table', '__fk_refId'],
+   ],
+   "First run adds or removes underscore from constraint names, accordingly"
+);
+
+# run second time: we expect constraint names to be prefixed with one underscore
+# if they havre't one, and to remove 2 if they have 2
+($output, $exit_status) = full_output(
+   sub { pt_online_schema_change::main(@args,
+      "$master_dsn,D=bug1632522,t=test_table",
+      "--alter", "ENGINE=InnoDB",
+      qw(--execute)) },
+);
+
+$query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     AND (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     AND CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+$constraints = $master_dbh->selectall_arrayref($query);
+
+
+is_deeply(
+   $constraints,
+   [
+      ['person', '__fk_testId'],
+      ['test_table', '_fk_refId'],
+      ['test_table', '__fk_person'],
+   ],
+   "Second run self-referencing will be one due to rebuild_constraints"
+);
+
+# run third time: we expect constraints to be the same as we started (toggled back)
+($output, $exit_status) = full_output(
+   sub { pt_online_schema_change::main(@args,
+      "$master_dsn,D=bug1632522,t=test_table",
+      "--alter", "ENGINE=InnoDB",
+      qw(--execute)) },
+);
+
+$query = <<"END";
+  SELECT TABLE_NAME, CONSTRAINT_NAME 
+    FROM information_schema.KEY_COLUMN_USAGE 
+   WHERE table_schema='bug1632522' 
+     and (TABLE_NAME='test_table' OR TABLE_NAME='person') 
+     and CONSTRAINT_NAME LIKE '%fk_%' 
+ORDER BY TABLE_NAME, CONSTRAINT_NAME
+END
+$constraints = $master_dbh->selectall_arrayref($query);
+
+
+is_deeply(
+   $constraints,
+   [
+      ['person', 'fk_testId'],
+      ['test_table', 'fk_person'],
+      ['test_table', 'fk_refId'],
+   ],
+   "Third run toggles constraint names back to how they were"
+);
+
+# #############################################################################
+# 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-1802.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `joinit` (
+`i` int(11) NOT NULL AUTO_INCREMENT,
+`s` varchar(64) DEFAULT NULL,
+`t` time NOT NULL,
+`g` int(11) NOT NULL,
+`j` int(11) NOT NULL DEFAULT 1,
+PRIMARY KEY (`i`))
+ENGINE=InnoDB;
+ALTER TABLE joinit ADD FOREIGN KEY i_fk (j) REFERENCES joinit (i) ON UPDATE cascade ON DELETE restrict;