Don't use -pmsandbox because 5.6 mysql cli warns that it's not safe. Plus, /tmp/PORT/use already adds --defaults-file=/tmp/PORT/my.sandbox.cnf.

This commit is contained in:
Daniel Nichter
2012-12-01 11:17:18 -07:00
parent 11907bbbe8
commit 9b97298721
3 changed files with 7 additions and 7 deletions

View File

@@ -35,7 +35,7 @@ my $cmd = "$trunk/bin/pt-kill -F $cnf -h 127.1";
# Shell out to a sleep(10) query and try to capture the query.
# Backticks don't work here.
system("/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(5)' >/dev/null &");
system("/tmp/12345/use -e 'select sleep(5)' >/dev/null &");
$output = `$cmd --busy-time 1s --print --run-time 10`;
@@ -59,7 +59,7 @@ ok(
# --iterations was 0, and another bug when --run-time was not respected.
# Do it all over again, this time with --iterations 0.
# Re issue 1181, --iterations no longer exists, but we'll still keep this test.
system("/tmp/12345/use -h127.1 -P12345 -umsandbox -pmsandbox -e 'select sleep(10)' >/dev/null&");
system("/tmp/12345/use -e 'select sleep(10)' >/dev/null&");
$output = `$cmd --busy-time 1s --print --run-time 11s`;
@times = $output =~ m/\(Query (\d+) sec\)/g;
ok(