Merge branch '2.2' into develop

2018-09-20 12:16:55 +03:00
parent 795796c8a2 8c2f6aafcc
commit d8d0b1a29c
9 changed files with 19 additions and 9 deletions
--- a/maxscale-system-test/mdbci/cnf/galera_server1.cnf
+++ b/maxscale-system-test/mdbci/cnf/galera_server1.cnf
@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=1
+server_id=101
 wsrep_on=ON

 # Row binary log format is required by Galera
--- a/maxscale-system-test/mdbci/cnf/galera_server2.cnf
+++ b/maxscale-system-test/mdbci/cnf/galera_server2.cnf
@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=2
+server_id=102
 wsrep_on=ON

 # Row binary log format is required by Galera
--- a/maxscale-system-test/mdbci/cnf/galera_server3.cnf
+++ b/maxscale-system-test/mdbci/cnf/galera_server3.cnf
@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=3
+server_id=103
 wsrep_on=ON

 # Row binary log format is required by Galera
--- a/maxscale-system-test/mdbci/cnf/galera_server4.cnf
+++ b/maxscale-system-test/mdbci/cnf/galera_server4.cnf
@ -1,7 +1,7 @@
 [mysqld]
 expire_logs_days=7
 user=mysql
-server_id=4
+server_id=104
 wsrep_on=ON

 # Row binary log format is required by Galera