Merge branch '3.x' into release-3.5.1

PT-7 Fix syntax (#573 )
PT-2162 Release Notes 3.5.1 (#571 )
2025-09-02 10:36:28 +00:00 · 2023-01-23 17:44:27 +03:00 · 2023-01-20 18:50:53 +03:00 · 2023-01-17 15:49:05 +03:00 · 2023-01-17 12:31:43 +03:00 · 2023-01-17 12:20:25 +03:00
42 changed files with 79 additions and 64 deletions
--- a/16
+++ b/16
@@ -1,5 +1,21 @@
 Changelog for Percona Toolkit

+v3.5.1 release 2023-01-23
+
+* Feature     PT-2134: Add support for PostgreSQL and MySQL operators in pt-k8s-debug-collector
+* Improvement PT-2138: Fix tests for pt-table-checksum
+* Improvement PT-2142: Fix tests for pt-config-diff
+* Improvement PT-2143: Fix tests for pt-deadlock-logger
+* Improvement PT-2144: Fix tests for pt-fifo-split
+* Improvement PT-2145: Fix tests for pt-find
+* Improvement PT-2146: Fix tests for pt-fk-error-logger
+* Improvement PT-2147: Fix tests for pt-heartbeat
+* Improvement PT-2148: Fix tests for pt-kill
+* Improvement PT-2153: Fix tests for pt-slave-find
+* Fixed bug   PT-2139: CVEs in golang binaries
+* Fixed bug   PT-2140: Update modules in the main branch
+* Fixed bug   PR-462:  Fix some spelling errors (Thanks Dario Minnucci)
+
 v3.5.0 release 2022-11-28

 * Improvement PT-1052: Include NUMA information in pt-tool output
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -1364,6 +1364,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-align 3.5.0
+pt-align 3.5.1

 =cut
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -8729,6 +8729,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-archiver 3.5.0
+pt-archiver 3.5.1

 =cut
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -43,7 +43,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5999,6 +5999,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-config-diff 3.5.0
+pt-config-diff 3.5.1

 =cut
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -42,7 +42,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5776,6 +5776,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-deadlock-logger 3.5.0
+pt-deadlock-logger 3.5.1

 =cut
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -38,7 +38,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5692,6 +5692,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-diskstats 3.5.0
+pt-diskstats 3.5.1

 =cut
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -39,7 +39,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5787,6 +5787,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-duplicate-key-checker 3.5.0
+pt-duplicate-key-checker 3.5.1

 =cut
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -1708,6 +1708,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fifo-split 3.5.0
+pt-fifo-split 3.5.1

 =cut
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -35,7 +35,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5202,6 +5202,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-find 3.5.0
+pt-find 3.5.1

 =cut
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -2271,6 +2271,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fingerprint 3.5.0
+pt-fingerprint 3.5.1

 =cut
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -37,7 +37,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -4763,6 +4763,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-fk-error-logger 3.5.0
+pt-fk-error-logger 3.5.1

 =cut
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -7460,6 +7460,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-heartbeat 3.5.0
+pt-heartbeat 3.5.1

 =cut
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -45,7 +45,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -7732,6 +7732,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-index-usage 3.5.0
+pt-index-usage 3.5.1

 =cut
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -1132,7 +1132,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-ioprofile 3.5.0
+pt-ioprofile 3.5.1

 =cut

--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -47,7 +47,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -8734,6 +8734,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-kill 3.5.0
+pt-kill 3.5.1

 =cut
--- a/bin/pt-mext
+++ b/bin/pt-mext
@@ -808,7 +808,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mext 3.5.0
+pt-mext 3.5.1

 =cut

--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -3294,7 +3294,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-mysql-summary 3.5.0
+pt-mysql-summary 3.5.1

 =cut

--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -56,7 +56,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -13467,6 +13467,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-online-schema-change 3.5.0
+pt-online-schema-change 3.5.1

 =cut
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -901,7 +901,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-pmp 3.5.0
+pt-pmp 3.5.1

 =cut

--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -64,7 +64,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -16977,6 +16977,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-query-digest 3.5.0
+pt-query-digest 3.5.1

 =cut
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2673,6 +2673,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-show-grants 3.5.0
+pt-show-grants 3.5.1

 =cut
--- a/bin/pt-sift
+++ b/bin/pt-sift
@@ -1249,7 +1249,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-sift 3.5.0
+pt-sift 3.5.1

 =cut

--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -40,7 +40,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -5061,6 +5061,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-delay 3.5.0
+pt-slave-delay 3.5.1

 =cut
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -4581,6 +4581,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-find 3.5.0
+pt-slave-find 3.5.1

 =cut
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -41,7 +41,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -6232,6 +6232,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-slave-restart 3.5.0
+pt-slave-restart 3.5.1

 =cut
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -2552,7 +2552,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-stalk 3.5.0
+pt-stalk 3.5.1

 =cut

--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -2769,7 +2769,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-summary 3.5.0
+pt-summary 3.5.1

 =cut

--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -58,7 +58,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -12421,7 +12421,7 @@ sub wait_for_slaves {
   my ($master_dbh, $ms, $slaves) = @args{@required_args};

   foreach my $slave ( @$slaves ) {
-       my $dp = %$slave{DSNParser};
+       my $dp = $slave->{DSNParser};
       my $mdbh = $dp->get_dbh($dp->get_cxn_params($slave->{parent}));
       my $master_status = $ms->get_master_status($mdbh);
       $ms->wait_for_master(master_status => $master_status, slave_dbh => $slave->dbh());
@@ -14129,6 +14129,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-checksum 3.5.0
+pt-table-checksum 3.5.1

 =cut
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -55,7 +55,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -13165,6 +13165,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-sync 3.5.0
+pt-table-sync 3.5.1

 =cut
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -8519,6 +8519,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-table-usage 3.5.0
+pt-table-usage 3.5.1

 =cut
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -61,7 +61,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -11516,6 +11516,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-upgrade 3.5.0
+pt-upgrade 3.5.1

 =cut
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -44,7 +44,7 @@ BEGIN {
 {
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
@@ -6326,6 +6326,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-variable-advisor 3.5.0
+pt-variable-advisor 3.5.1

 =cut
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -3308,6 +3308,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-pt-visual-explain 3.5.0
+pt-visual-explain 3.5.1

 =cut
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -575,6 +575,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.

 =head1 VERSION

-Percona Toolkit v3.5.0 released 2022-11-28
+Percona Toolkit v3.5.1 released 2023-01-23

 =cut
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -2,7 +2,6 @@ Percona Toolkit
 ***************

 v3.5.1 released 2023-01-23
-==============================

 New Features
 ------------------------------------------------------------
--- a/lib/Percona/Toolkit.pm
+++ b/lib/Percona/Toolkit.pm
@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;

-our $VERSION = '3.5.0';
+our $VERSION = '3.5.1';

 use strict;
 use warnings FATAL => 'all';
--- a/src/go/pt-mongodb-index-check/main.go
+++ b/src/go/pt-mongodb-index-check/main.go
@@ -48,7 +48,7 @@ const (
 var (
 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.5.0"      //nolint
+	Version   string = "3.5.1"      //nolint
 	Commit    string                //nolint
 )

--- a/src/go/pt-mongodb-query-digest/main.go
+++ b/src/go/pt-mongodb-query-digest/main.go
@@ -41,7 +41,7 @@ const (
 var (
 	Build     string = "2020-04-23" //nolint
 	GoVersion string = "1.14.1"     //nolint
-	Version   string = "3.5.0"      //nolint
+	Version   string = "3.5.1"      //nolint
 	Commit    string                //nolint
 )

--- a/src/go/pt-mongodb-summary/main.go
+++ b/src/go/pt-mongodb-summary/main.go
@@ -57,7 +57,7 @@ const (
 var (
 	Build     string = "2020-04-23"
 	GoVersion string = "1.14.1"
-	Version   string = "3.5.0"
+	Version   string = "3.5.1"
 	Commit    string

 	defaultConnectionTimeout = 3 * time.Second
--- a/src/go/pt-pg-summary/main.go
+++ b/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.5.0"      //nolint
+	Version   string = "3.5.1"      //nolint
 )

 type connOpts struct {
--- a/src/go/pt-secure-collect/main.go
+++ b/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.5.0"      //nolint
+	Version   string = "3.5.1"      //nolint
 	Commit    string                //nolint
 )

--- a/util/build-packages
+++ b/util/build-packages
@@ -484,11 +484,6 @@ OS_ARCH=${3:-linux-amd64}

 ONLY_UPDATE_VERSION=${ONLY_UPDATE_VERSION:-0}

-if [ $ONLY_UPDATE_VERSION -eq 1 ]; then
-   update_version
-   exit
-fi
-
 if [ $OS_ARCH != "linux-amd64" ] && [ $OS_ARCH != "linux-386" ] && [ $OS_ARCH != "darwin-amd64" ]; then
   die "Valid OS-ARCH combinations are: linux-amd64, linux-386, darwin-amd64"
 fi
@@ -522,6 +517,11 @@ DATE=$(date -u +'%F')                      # for updating release date
 DEB_DATE=$(date -u +'%a, %d %b %Y %T %z')  # for updating deb/changelog
 PKG="percona-toolkit-$VERSION"             # what we're building

+if [ $ONLY_UPDATE_VERSION -eq 1 ]; then
+   update_version
+   exit
+fi
+
 # mktemp -d doesn't work on Mac OS X, so we'll do it the old-fashioned way.
 tmpdir="/tmp/build-percona-toolkit-$VERSION"
 rm -rf $tmpdir >/dev/null 2>&1
Author	SHA1	Message	Date
Sveta Smirnova	bf4a095c69	Merge branch '3.x' into release-3.5.1	2023-01-23 17:44:27 +03:00
EvgeniyPatlan	ddd0fcfaf9	PT-7 Fix syntax (#573 )	2023-01-20 18:50:53 +03:00
Alina Derkach	ce14fbceba	PT-2162 Release Notes 3.5.1 (#571 ) modified: Makefile.PL modified: config/sphinx-build/conf.py modified: docs/release_notes.rst new file: docs/rn.3-5-1.txt Co-authored-by: Alina Derkach <“alina.derkach@percona.com”>	2023-01-17 15:49:05 +03:00
svetasmirnova	a0930a4e64	RM-1153 - Percona Toolkit 3.5.1 Updated Changelog Updated release date in docs/percona-toolkit.pod	2023-01-17 12:31:43 +03:00
svetasmirnova	4a33e5e52b	RM-1153 - Percona Toolkit 3.5.1 Updated version for Perl files to 3.5.1 Updated Perl module Percona::Toolkit to version 3.5.1 and updated all scripts using this module Manually updated Go programs Moved ONLY_UPDATE_VERSION after definition of DATE and SERIES variables, so the script does not fail because of undefined variables	2023-01-17 12:20:25 +03:00