diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-15 12:34:32 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-15 12:34:32 +0200 |
| commit | e0a9cd56a76d4dfcf797e5a0186f53405f0b7fef (patch) | |
| tree | 0cdd426c6698e735260ce027844c7945621fe45f /mysql-test/mysql-stress-test.pl | |
| parent | 32e8085de932a60d933b6405cdbaf5982d6204c3 (diff) | |
| download | mariadb-git-e0a9cd56a76d4dfcf797e5a0186f53405f0b7fef.tar.gz | |
Bug #11751927 42960: MTR2: NO MORE --STRESS PARAMETERS
Quick fix: run mysql-stress-test.pl via a wrapper test
Amend mtr to run just that test when using --stress
Updated mysql-stress-test.pl to exit(1) if wrong options
Diffstat (limited to 'mysql-test/mysql-stress-test.pl')
| -rwxr-xr-x | mysql-test/mysql-stress-test.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/mysql-stress-test.pl b/mysql-test/mysql-stress-test.pl index f2471d169d1..0e3b52d7bf5 100755 --- a/mysql-test/mysql-stress-test.pl +++ b/mysql-test/mysql-stress-test.pl @@ -238,9 +238,9 @@ GetOptions("server-host=s", "server-logs-dir=s", "server-port=s", "test-duration=i", "test-suffix=s", "check-tests-file", "verbose", "log-error-details", "cleanup", "mysqltest=s", # OBN: (changing 'abort-on-error' to numberic for WL-4626/4685) - "abort-on-error=i" => \$opt_abort_on_error, "help") || usage(); + "abort-on-error=i" => \$opt_abort_on_error, "help") || usage(1); -usage() if ($opt_help); +usage(0) if ($opt_help); #$opt_abort_on_error=1; @@ -1131,6 +1131,7 @@ sub sig_TERM_handler sub usage { + my $retcode= shift; print <<EOF; The MySQL Stress suite Ver $stress_suite_version @@ -1234,7 +1235,7 @@ perl mysql-stress-test.pl \ --cleanup \ EOF -exit(0); +exit($retcode); } |