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

Reverted a few unnecessary changes

Browse Source
This commit is contained in:
Brian Fraser
2012-11-08 17:47:00 -03:00
parent 42a9cf4b6e
commit 7beb0b518e
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-config-diff
-1
View File
@@ -1466,7 +1466,6 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use constant { use constant {
PTDEBUG => $ENV{PTDEBUG} || 0, PTDEBUG => $ENV{PTDEBUG} || 0,
PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0, PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
bin/pt-kill
-1
View File
@@ -4715,7 +4715,6 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use constant { use constant {
PTDEBUG => $ENV{PTDEBUG} || 0, PTDEBUG => $ENV{PTDEBUG} || 0,
PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0, PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
bin/pt-online-schema-change
-1
View File
@@ -3345,7 +3345,6 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use constant { use constant {
PTDEBUG => $ENV{PTDEBUG} || 0, PTDEBUG => $ENV{PTDEBUG} || 0,
PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0, PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
lib/Cxn.pm
-1
View File
@@ -36,7 +36,6 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use constant { use constant {
PTDEBUG => $ENV{PTDEBUG} || 0, PTDEBUG => $ENV{PTDEBUG} || 0,
# Hostnames make testing less accurate. Tests need to see # Hostnames make testing less accurate. Tests need to see
lib/Sandbox.pm
+2 -2
View File
@@ -76,7 +76,7 @@ sub use {
return if !defined $cmd || !$cmd; return if !defined $cmd || !$cmd;
my $use = $self->_use_for($server) . " $cmd"; my $use = $self->_use_for($server) . " $cmd";
PTDEBUG && _d('"Executing', $use, 'on', $server); PTDEBUG && _d('"Executing', $use, 'on', $server);
my $out = `$use`; my $out = `$use 2>&1`;
if ( $? >> 8 ) { if ( $? >> 8 ) {
die "Failed to execute $cmd on $server: $out"; die "Failed to execute $cmd on $server: $out";
} }
@@ -143,7 +143,7 @@ sub load_file {
my $use = $self->_use_for($server) . " $d < $file"; my $use = $self->_use_for($server) . " $d < $file";
PTDEBUG && _d('Loading', $file, 'on', $server, ':', $use); PTDEBUG && _d('Loading', $file, 'on', $server, ':', $use);
my $out = `$use`; my $out = `$use 2>&1`;
if ( $? >> 8 ) { if ( $? >> 8 ) {
die "Failed to execute $file on $server: $out"; die "Failed to execute $file on $server: $out";
} }
t/lib/Cxn.t
+6 -4
View File
@@ -9,8 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More; use Test::More tests => 19;
use Data::Dumper;
use Sandbox; use Sandbox;
use OptionParser; use OptionParser;
@@ -18,7 +17,8 @@ use DSNParser;
use Quoter; use Quoter;
use PerconaTest; use PerconaTest;
use Cxn; use Cxn;
use VersionParser;
use Data::Dumper;
my $q = new Quoter(); my $q = new Quoter();
my $dp = new DSNParser(opts=>$dsn_opts); my $dp = new DSNParser(opts=>$dsn_opts);
@@ -248,10 +248,12 @@ is_deeply(
"Default cxn inherits default connection options" "Default cxn inherits default connection options"
); );
@ARGV = ();
$o->get_opts();
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
$master_dbh->disconnect() if $master_dbh; $master_dbh->disconnect() if $master_dbh;
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit; exit;