Update progress.t, option_sanity.t, and standard_options.t. Make test env always have slave2 (12347, slave of 12346). Add PerconaTest::count_checksum_results(). Add util/wait-to-exec.

This commit is contained in:
Daniel Nichter
2011-10-14 11:45:11 -06:00
parent 48fb4baa7c
commit 4ad88ddd93
11 changed files with 294 additions and 73 deletions

View File

@@ -291,6 +291,7 @@ case $opt in
exit_status=$?
if [ $exit_status -eq 0 ]; then
./start-sandbox slave 12346 12345
./start-sandbox slave 12347 12346
exit_status=$?
if [ "$version" != "4.0" ] && [ "$version" != "4.1" ]; then
if [ $? -eq 0 ]; then
@@ -353,11 +354,18 @@ case $opt in
# don't replicate to new sandbox servers. This makes creating new
# sandbox servers a lot faster. There's no check if this works or
# not, so... yeah.
/tmp/12345/use -e "RESET MASTER"
/tmp/12346/use -e "RESET MASTER"
/tmp/12347/use -e "STOP SLAVE"
/tmp/12346/use -e "STOP SLAVE"
/tmp/12346/use -e "RESET MASTER"
/tmp/12345/use -e "RESET MASTER"
/tmp/12347/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=12346, master_log_file='mysql-bin.000001', master_log_pos=0"
/tmp/12346/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=12345, master_log_file='mysql-bin.000001', master_log_pos=0"
/tmp/12347/use -e "START SLAVE"
/tmp/12346/use -e "START SLAVE"
exit_status=0
;;
version)