summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-01-03 13:44:16 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-01-03 13:44:16 +0100
commit7753a290645ca4af8b11f2fff1f47c3a64d45732 (patch)
treee421eaafa2bd26bfe8ba21fb76a13b017348d2cd /plugin
parent02e30069573b09f5d26b6c357cd8aee3e876385a (diff)
parentb35290e19bda02257e4cf6c6acc6133b4e3f2372 (diff)
downloadmariadb-git-7753a290645ca4af8b11f2fff1f47c3a64d45732.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'plugin')
-rw-r--r--plugin/wsrep_info/mysql-test/wsrep_info/my.cnf2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
index 52c7789e9f7..c9d47e40d4b 100644
--- a/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
+++ b/plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
@@ -11,6 +11,7 @@ wsrep_provider=@ENV.WSREP_PROVIDER
[mysqld.1]
#galera_port=@OPT.port
#sst_port=@OPT.port
+wsrep-on=1
wsrep_provider_options='base_port=@mysqld.1.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
wsrep_node_name=test-node-1
@@ -18,6 +19,7 @@ wsrep_node_name=test-node-1
[mysqld.2]
#galera_port=@OPT.port
#sst_port=@OPT.port
+wsrep-on=1
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
wsrep_provider_options='base_port=@mysqld.2.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'