Fix more test output broken by percona_test.load_data. Tweak ptc/t/privs.t so it passes on my box. Fix new start/stop scripts: don't check ibdata1 because SKIP_INNODB may be used. Make PerconaTest::output() cleaner.

This commit is contained in:
Daniel Nichter
2012-08-01 14:58:52 -06:00
parent ad46ec779e
commit cc3826f665
12 changed files with 61 additions and 53 deletions

View File

@@ -110,18 +110,18 @@ ok(
$row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
is(
$row->[0],
( $sandbox_version gt "5.1" ? 89
: $sandbox_version gt "5.0" ? 88
: 84),
( $sandbox_version gt "5.1" ? 90
: $sandbox_version gt "5.0" ? 89
: 85),
'Expected checksums on master'
);
$row = $slave1_dbh->selectrow_arrayref("select count(*) from percona.checksums");
is(
$row->[0],
( $sandbox_version gt "5.1" ? 89
: $sandbox_version gt "5.0" ? 88
: 84),
( $sandbox_version gt "5.1" ? 90
: $sandbox_version gt "5.0" ? 89
: 85),
'Expected checksums on slave'
);