percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-20 09:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated all tests for PS 5.7

Browse Source
This commit is contained in:
Carlos Salguero
2017-12-18 13:01:11 -03:00
parent bb3334de08
commit 5c106b4fad
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/MySQLStatusWaiter.pm
View File

@@ -175,7 +175,7 @@ sub wait {
die "$var=$val exceeds its critical threshold " die "$var=$val exceeds its critical threshold "
. "$self->{critical_val_for}->{$var}\n"; . "$self->{critical_val_for}->{$var}\n";
} }
if ( $val >= $self->{max_val_for}->{$var} ) { if ( $val && $val >= $self->{max_val_for}->{$var} ) {
$vals_too_high{$var} = $val; $vals_too_high{$var} = $val;
} }
else { else {

2
t/lib/SchemaIterator.t
View File

@@ -291,7 +291,7 @@ SKIP: {
test_name => '-t d1.t1,d1.t3 (issue 806)', test_name => '-t d1.t1,d1.t3 (issue 806)',
); );
my $want = $sandbox_version le '5.6' ? "d1.t1 " : 'd1.t2 d1.t3 d2.t1 sys.sys_config '; my $want = $sandbox_version le '5.6' ? "d1.t2 d1.t3 d2.t1 " : 'd1.t2 d1.t3 d2.t1 sys.sys_config ';
test_so( test_so(
filters => ['--ignore-databases', 'mysql,sakila,percona_test', filters => ['--ignore-databases', 'mysql,sakila,percona_test',
'--ignore-tables', 'd1.t1'], '--ignore-tables', 'd1.t1'],

26
t/pt-deadlock-logger/basics.t
View File

@@ -43,6 +43,9 @@ $dbh2->commit;
$dbh1->{InactiveDestroy} = 1; $dbh1->{InactiveDestroy} = 1;
$dbh2->{InactiveDestroy} = 1; $dbh2->{InactiveDestroy} = 1;
$dbh1->{mysql_auto_reconnect} = 1;
$dbh2->{mysql_auto_reconnect} = 1;
sub make_deadlock { sub make_deadlock {
# Fork off two children to deadlock against each other. # Fork off two children to deadlock against each other.
my %children; my %children;
@@ -82,12 +85,28 @@ sub make_deadlock {
foreach my $child ( keys %children ) { foreach my $child ( keys %children ) {
my $pid = waitpid($children{$child}, 0); my $pid = waitpid($children{$child}, 0);
} }
$dbh1->commit; eval {
$dbh2->commit; $dbh1->commit;
$dbh1->disconnect();
};
eval {
$dbh2->commit;
$dbh2->disconnect();
};
}
sub reconnect {
my $dbh = shift;
$dbh->disconnect();
$dbh = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
return $dbh;
} }
make_deadlock(); make_deadlock();
$dbh1 = reconnect($dbh1);
$dbh2 = reconnect($dbh2);
# Test that there is a deadlock # Test that there is a deadlock
$output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status}; $output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status};
like($output, qr/WE ROLL BACK/, 'There was a deadlock'); like($output, qr/WE ROLL BACK/, 'There was a deadlock');
@@ -208,6 +227,9 @@ SKIP: {
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
$dbh1 = reconnect($dbh1);
$dbh2 = reconnect($dbh2);
$dbh1->commit; $dbh1->commit;
$dbh2->commit; $dbh2->commit;
$sb->wipe_clean($dbh1); $sb->wipe_clean($dbh1);