various 5.7 test and tool compatibility fixes

This commit is contained in:
frank-cizmich
2015-12-24 09:49:17 -03:00
parent 9616c8a415
commit 6433c99713
11 changed files with 343 additions and 43 deletions

View File

@@ -68,11 +68,12 @@ $sb->wait_for_slaves();
# then starts it again.
# TEST_WISHLIST PLUGIN_WISHLIST: do this with a plugin to the tool itself,
# not in this unreliable fashion.
system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop slave sql_thread\" 2 \"start slave sql_thread\"' 4 >/dev/null &");
system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop slave sql_thread\" 4 \"start slave sql_thread\"' 4 >/dev/null &");
$output = output(
sub { pt_table_checksum::main(@args, qw(-d sakila)); },
stderr => 1,
keep_output => 1,
);
like(