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

@@ -8,7 +8,7 @@ BASEDIR="PERCONA_TOOLKIT_SANDBOX"
sandbox_is_alive() {
# First, all these files must exist.
[ -f $PIDFILE -a -S $SOCKETFILE -a -s "/tmp/PORT/data/ibdata1" ] || return 1
[ -f $PIDFILE -a -S $SOCKETFILE ] || return 1
# And that PID file must have a PID.
local pid=$(cat /tmp/PORT/data/mysql_sandboxPORT.pid 2>/dev/null)