diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:47:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:47:24 +0200 |
| commit | 274e06a50488af3e16eda1fbb583073ec7047678 (patch) | |
| tree | 0b5877c17e4aaa8a5d4c58f6d4e4a8597a205888 | |
| parent | 5b74c2da72ff24d0af18b57e9dca8dcf238e635d (diff) | |
| download | mariadb-git-274e06a50488af3e16eda1fbb583073ec7047678.tar.gz | |
only allocate extra-port (in tests) when needed
(otherwise 10 ports per worker will be not enough)
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_test_framework.cnf | 18 | ||||
| -rw-r--r-- | mysql-test/t/connect.cnf | 4 | ||||
| -rw-r--r-- | mysql-test/t/pool_of_threads.cnf | 4 |
4 files changed, 4 insertions, 23 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 90d2eaa0d76..8df4fa53cc7 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -236,7 +236,6 @@ my @mysqld_rules= { 'pid-file' => \&fix_pidfile }, { '#host' => \&fix_host }, { 'port' => \&fix_port }, - { '#extra-port' => \&fix_port }, { 'socket' => \&fix_socket }, { '#log-error' => \&fix_log_error }, { 'general-log' => sub { return 1; } }, diff --git a/mysql-test/suite/rpl/t/rpl_test_framework.cnf b/mysql-test/suite/rpl/t/rpl_test_framework.cnf index 8934d1c9ae1..755e36220f6 100644 --- a/mysql-test/suite/rpl/t/rpl_test_framework.cnf +++ b/mysql-test/suite/rpl/t/rpl_test_framework.cnf @@ -17,18 +17,6 @@ log-slave-updates log-slave-updates [mysqld.9] log-slave-updates -#[mysqld.10] -#log-slave-updates -#[mysqld.11] -#log-slave-updates -#[mysqld.12] -#log-slave-updates -#[mysqld.13] -#log-slave-updates -#[mysqld.14] -#log-slave-updates -#[mysqld.15] -#log-slave-updates [ENV] SERVER_MYPORT_3= @mysqld.3.port @@ -38,9 +26,3 @@ SERVER_MYPORT_6= @mysqld.6.port SERVER_MYPORT_7= @mysqld.7.port SERVER_MYPORT_8= @mysqld.8.port SERVER_MYPORT_9= @mysqld.9.port -#SERVER_MYPORT_10= @mysqld.10.port -#SERVER_MYPORT_11= @mysqld.11.port -#SERVER_MYPORT_12= @mysqld.12.port -#SERVER_MYPORT_13= @mysqld.13.port -#SERVER_MYPORT_14= @mysqld.14.port -#SERVER_MYPORT_15= @mysqld.15.port diff --git a/mysql-test/t/connect.cnf b/mysql-test/t/connect.cnf index caf51ee2085..4f8d8b06b63 100644 --- a/mysql-test/t/connect.cnf +++ b/mysql-test/t/connect.cnf @@ -1,8 +1,8 @@ !include include/default_my.cnf [mysqld.1] -extra-port= @mysqld.1.#extra-port +extra-port= @ENV.MASTER_EXTRA_PORT extra-max-connections=1 [ENV] -MASTER_EXTRA_PORT= @mysqld.1.#extra-port +MASTER_EXTRA_PORT= @OPT.port diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/t/pool_of_threads.cnf index 4ae202bab6c..d719cc22ad4 100644 --- a/mysql-test/t/pool_of_threads.cnf +++ b/mysql-test/t/pool_of_threads.cnf @@ -3,11 +3,11 @@ [mysqld.1] loose-thread-handling= pool-of-threads loose-thread_pool_size= 2 -extra-port= @mysqld.1.#extra-port +extra-port= @ENV.MASTER_EXTRA_PORT extra-max-connections=1 [client] connect-timeout= 2 [ENV] -MASTER_EXTRA_PORT= @mysqld.1.#extra-port +MASTER_EXTRA_PORT= @OPT.port |