summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-02-17 16:28:02 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-02-17 16:28:02 +0100
commit90c3ace052e0649d6e93804be2b39b98db6ec15d (patch)
tree1da704fd4d7dd4e4ce04a3f71353d32a46ee2d4b /mysql-test
parent5b7306e259e98f087b04d2fee15ace06fad941c5 (diff)
downloadmariadb-git-90c3ace052e0649d6e93804be2b39b98db6ec15d.tar.gz
Bug #51135 Please increase the maximum number of connections allowed in mysqltest
Added --max-connections= argument to mysqltest and mtr Small fix to first patch: forgot to check before free'ing connections array
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1e564e26c4c..a35741bebda 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -203,6 +203,7 @@ my $opt_skip_core;
our $opt_check_testcases= 1;
my $opt_mark_progress;
+my $opt_max_connections;
my $opt_sleep;
@@ -923,6 +924,7 @@ sub command_line_setup {
'warnings!' => \$opt_warnings,
'timestamp' => \&report_option,
'timediff' => \&report_option,
+ 'max-connections=i' => \$opt_max_connections,
'help|h' => \$opt_usage,
'list-options' => \$opt_list_options,
@@ -4909,6 +4911,10 @@ sub start_mysqltest ($) {
mtr_add_arg($args, "--ssl");
}
+ if ( $opt_max_connections ) {
+ mtr_add_arg($args, "--max-connections=%d", $opt_max_connections);
+ }
+
if ( $opt_embedded_server )
{
@@ -5467,6 +5473,7 @@ Misc options
timestamp Print timestamp before each test report line
timediff With --timestamp, also print time passed since
*previous* test started
+ max-connections=N Max number of open connection to server in mysqltest
HERE
exit(1);