diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-26 19:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-26 19:21:19 +0200 |
| commit | f42e08f951642850b1b9e3c2858325d21b260223 (patch) | |
| tree | 672195393e56b4e12b4802ad042e957ef46fde7c /mysql-test/suite/galera/galera_2nodes.cnf | |
| parent | 8c35f105d24a71fb34b83e38ed57ed02338be415 (diff) | |
| parent | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (diff) | |
| download | mariadb-git-f42e08f951642850b1b9e3c2858325d21b260223.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'mysql-test/suite/galera/galera_2nodes.cnf')
| -rw-r--r-- | mysql-test/suite/galera/galera_2nodes.cnf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf index 34bf1fc58fe..f120775d433 100644 --- a/mysql-test/suite/galera/galera_2nodes.cnf +++ b/mysql-test/suite/galera/galera_2nodes.cnf @@ -16,7 +16,7 @@ wsrep-sync-wait=7 #ist_port=@OPT.port #sst_port=@OPT.port wsrep-cluster-address=gcomm:// -wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;gcache.size=10M;evs.suspect_timeout=PT10S' +wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;gcache.size=10M' wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port' |