summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-09-02 16:36:52 +0300
committerGeorgi Kodinov <joro@sun.com>2009-09-02 16:36:52 +0300
commit183607b8c864684a67fea2c11fa2755abd11f6ab (patch)
treef5bf5364012b352f3b1a75ac5a6e257d7f5a0d67 /mysql-test
parent50d8792b588e1d2edb9f481585590f8f919ee1b4 (diff)
downloadmariadb-git-183607b8c864684a67fea2c11fa2755abd11f6ab.tar.gz
Backported the --parallel=str option from mtr2 for backward compatibility
with the newer pb2 testing environments
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f60701b7b49..e98e05eadb1 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -302,6 +302,7 @@ our $debug_compiled_binaries;
our %mysqld_variables;
+our $opt_parallel;
my $source_dist= 0;
our $opt_max_save_core= 5;
@@ -645,6 +646,7 @@ sub command_line_setup () {
'testcase-timeout=i' => \$opt_testcase_timeout,
'suite-timeout=i' => \$opt_suite_timeout,
'warnings|log-warnings' => \$opt_warnings,
+ 'parallel=s' => \$opt_parallel,
# Options which are no longer used
(map { $_ => \&warn_about_removed_option } @removed_options),
@@ -5278,6 +5280,7 @@ Misc options
the specified test case (if any)
fast Don't try to clean up from earlier runs
reorder Reorder tests to get fewer server restarts
+ parallel=STR Compatibility slot. Ignored.
help Get this help text
testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)