Add back PerconaTest::slurp_file(). Put in scope in pt-index-usage. Sort MySQL instance IDs for testing. Wait for pid file in pt-heartbeat/basics.t.

This commit is contained in:
Daniel Nichter
2012-08-28 15:28:34 -06:00
parent 8afb9ea5ff
commit a3950411b9
5 changed files with 14 additions and 7 deletions

View File

@@ -5950,11 +5950,11 @@ sub main {
# are given on the cmd line then parse_options() will return undef,
# but get_cxn() required a defined dsn arg so use an empty hashref.
# ##########################################################################
my ($dbh, $si_dbh, $res_dbh);
my ($dsn, $dbh, $si_dbh, $res_dbh);
my $res_dsn;
my $res_db;
eval {
my $dsn = $dp->parse_options($o) || {};
$dsn = $dp->parse_options($o) || {};
# dbh for EXPLAIN-ing.
$dbh = get_cxn(
@@ -6086,7 +6086,7 @@ sub main {
# ########################################################################
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
Pingback::version_check(
{ dbh => $dbh, dsn => $dsn },
{ dbh => $dbh, dsn => $dsn },
($res_dbh ? { dbh => $res_dbh, dsn => $res_dsn } : ()),
);
}