diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-31 18:35:57 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-31 18:35:57 +0300 |
| commit | ff650ab048d66e03cf273ab98a09fd90ed075168 (patch) | |
| tree | ac8f029b5145b5bebb2ad2e00aac20a178a0e55f /mysql-test | |
| parent | f2f5fd36c0d4f909a0f27a68046ce74781b80a1b (diff) | |
| parent | fc5953250b0b79cfedc9149fc056c7594dcbdf21 (diff) | |
| download | mariadb-git-ff650ab048d66e03cf273ab98a09fd90ed075168.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 29950f124d6..30abdcbcf72 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4913,6 +4913,8 @@ sub mysqld_arguments ($$$) { } mtr_add_arg($args, "%s--disable-sync-frm"); + # Retry bind as this may fail on busy server + mtr_add_arg($args, "%s--port-open-timeout=10"); if (!using_extern() and $mysql_version_id >= 50106 && !$opt_user_args) { |