Merge branch '2.3' into develop

maxscale-system-test/Documentation/RELEASE.md

@@ -248,3 +248,16 @@ On behalf of the entire MaxScale team,
 
 YOUR NAME HERE
 ```
+
+## 10. Update the version number for the next release
+
+Increment the `MAXSCALE_VERSION_PATCH` value in the `VERSIONxx.cmake` file
+in the source root where `xx` is the major and minor release number. For
+example, with 2.2 releases, update the `VERSION22.cmake` file.
+
+If the `MAXSCALE_BUILD_NUMBER` is not 1, set it to 1. This is only
+incremented if the packages have to be rebuilt after a release has been
+made.
+
+Make sure the `VERSION.cmake` points to the latest `VERSIONxx.cmake` file
+so that updates in older releases won't affect newer releases.

maxscale-system-test/cnf/maxscale.cnf.template.maxrows

@@ -1,11 +1,16 @@
 [maxscale]
 threads=###threads###
-log_warning=1
+
+[server1]
+type=server
+address=###node_server_IP_1###
+port=###node_server_port_1###
+protocol=MySQLBackend
 
 [MySQL-Monitor]
 type=monitor
 module=mysqlmon
-servers= server1, server2,server3  ,server4
+servers=server1
 user=maxskysql
 password= skysql
 monitor_interval=1000
@@ -13,8 +18,8 @@ detect_stale_master=false
 
 [RW-Split-Router]
 type=service
-router= readwritesplit
-servers=server1,     server2,              server3,server4
+router=readwritesplit
+servers=server1
 user=maxskysql
 password=skysql
 slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
@@ -25,7 +30,7 @@ filters=MaxRows
 type=service
 router=readconnroute
 router_options= slave
-servers=server1,server2,server3,server4
+servers=server1
 user=maxskysql
 password=skysql
 
@@ -33,7 +38,7 @@ password=skysql
 type=service
 router=readconnroute
 router_options=master
-servers=server1,server2,server3,server4
+servers=server1
 user=maxskysql
 password=skysql
 
@@ -42,7 +47,6 @@ type=listener
 service=RW-Split-Router
 protocol=MySQLClient
 port=4006
-#socket=/tmp/rwsplit.sock
 
 [Read-Connection-Listener-Slave]
 type=listener
@@ -64,7 +68,6 @@ router=cli
 type=listener
 service=CLI
 protocol=maxscaled
-#address=localhost
 socket=default
 
 [MaxRows]
@@ -73,28 +76,3 @@ module=maxrows
 max_resultset_rows=20
 max_resultset_size=900000000
 debug=3
-
-[server1]
-type=server
-address=###node_server_IP_1###
-port=###node_server_port_1###
-protocol=MySQLBackend
-
-[server2]
-type=server
-address=###node_server_IP_2###
-port=###node_server_port_2###
-protocol=MySQLBackend
-
-[server3]
-type=server
-address=###node_server_IP_3###
-port=###node_server_port_3###
-protocol=MySQLBackend
-
-[server4]
-type=server
-address=###node_server_IP_4###
-port=###node_server_port_4###
-protocol=MySQLBackend
-

maxscale-system-test/fwf_syntax.cpp

@@ -64,7 +64,7 @@ int main(int argc, char** argv)
     for (int i = 0; rules_failure[i]; i++)
     {
         /** Create rule file with syntax error */
-        test.add_result(truncate(temp_rules, 0), "Failed to truncate");
+        int __attribute__((unused)) rc = truncate(temp_rules, 0);
         create_rule(rules_failure[i], users_ok[0]);
         char buf[PATH_MAX + 1];
         copy_rules(&test, (char*)temp_rules, (char*)getcwd(buf, sizeof(buf)));