summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera/galera_2nodes.cnf
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-04-21 13:17:17 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-05-08 17:43:57 -0400
commit3331d4e07efca993b3f34fa06b8a03b41b6b690d (patch)
tree33ec8ad535c4003ce4e7bda050641cb748b35a04 /mysql-test/suite/galera/galera_2nodes.cnf
parent608a1ce5b184f617d45c69095e1fae7b39402853 (diff)
downloadmariadb-git-3331d4e07efca993b3f34fa06b8a03b41b6b690d.tar.gz
Merge galera tests from github.com/codership/mysql-wsrep
Diffstat (limited to 'mysql-test/suite/galera/galera_2nodes.cnf')
-rw-r--r--mysql-test/suite/galera/galera_2nodes.cnf8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf
index 38a57758064..7e998e387dc 100644
--- a/mysql-test/suite/galera/galera_2nodes.cnf
+++ b/mysql-test/suite/galera/galera_2nodes.cnf
@@ -5,9 +5,8 @@
binlog-format=row
innodb-autoinc-lock-mode=2
default-storage-engine=innodb
-
-wsrep-cluster-address=gcomm://
wsrep-provider=@ENV.WSREP_PROVIDER
+wsrep_node_address=127.0.0.1
# enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON
wsrep-sync-wait=7
@@ -16,9 +15,10 @@ wsrep-sync-wait=7
#galera_port=@OPT.port
#ist_port=@OPT.port
#sst_port=@OPT.port
+wsrep-cluster-address=gcomm://
wsrep_provider_options='base_port=@mysqld.1.#galera_port;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'
-wsrep_node_incoming_address=127.0.0.1
[mysqld.2]
#galera_port=@OPT.port
@@ -26,8 +26,10 @@ wsrep_node_incoming_address=127.0.0.1
#sst_port=@OPT.port
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=10M'
+wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
+
[ENV]
NODE_MYPORT_1= @mysqld.1.port
NODE_MYSOCK_1= @mysqld.1.socket