percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-02-27 02:00:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into PT-2309_pt-table-sync_hits_an_error_when_the_primary_key_is_uuid_binary

Browse Source
This commit is contained in:
Sveta Smirnova
2024-04-18 13:16:19 +03:00
parent eac0b21407 18d4fe9183
commit 6632ccc044
27 changed files with 190 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/pt-archiver
View File

@@ -3781,7 +3781,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

3
bin/pt-heartbeat
View File

@@ -242,7 +242,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

4
bin/pt-ioprofile
View File

@@ -408,7 +408,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -453,7 +453,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

3
bin/pt-kill
View File

@@ -4058,7 +4058,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

4
bin/pt-mext
View File

@@ -449,7 +449,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -494,7 +494,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

4
bin/pt-mysql-summary
View File

@@ -410,7 +410,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -455,7 +455,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

3
bin/pt-online-schema-change
View File

@@ -4346,7 +4346,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

4
bin/pt-pmp
View File

@@ -451,7 +451,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -496,7 +496,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

3
bin/pt-query-digest
View File

@@ -10652,7 +10652,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

4
bin/pt-sift
View File

@@ -449,7 +449,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -494,7 +494,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

3
bin/pt-slave-find
View File

@@ -2383,7 +2383,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

3
bin/pt-slave-restart
View File

@@ -2794,7 +2794,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

4
bin/pt-stalk
View File

@@ -462,7 +462,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -507,7 +507,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

4
bin/pt-summary
View File

@@ -417,7 +417,7 @@ _parse_command_line() {
fi
if $(echo $opt | grep '^[a-z-][a-z-]*=' >/dev/null 2>&1); then
val="$(echo $opt | awk -F= '{print $2}')"
val="$(echo "$opt" | awk '{ st = index($0,"="); print substr($0, st+1)}')"
opt="$(echo $opt | awk -F= '{print $1}')"
fi
@@ -462,7 +462,7 @@ _parse_command_line() {
val=$(size_to_bytes $val)
fi
eval "OPT_$opt"="'$val'"
eval "OPT_$opt"='$val'
opt=""
val=""

3
bin/pt-table-checksum
View File

@@ -5298,7 +5298,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;

3
bin/pt-table-sync
View File

@@ -6812,7 +6812,8 @@ sub recurse_to_slaves {
my $slave_dsn = $dsn;
if ($slave_user) {
$slave_dsn->{u} = $slave_user;
PTDEBUG && _d("Using slave user $slave_user on ".$slave_dsn->{h}.":".$slave_dsn->{P});
PTDEBUG && _d("Using slave user $slave_user on "
. $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
}
if ($slave_password) {
$slave_dsn->{p} = $slave_password;