Merge branch '2.2' into develop

Documentation/Getting-Started/Configuration-Guide.md

@@ -223,6 +223,16 @@ This parameter is intended to be used with multiple MaxScale instances that use
 failover functionality to manipulate the cluster in some form. Passive nodes
 only observe the clusters being monitored and take no direct actions.
 
+The following functionality is disabled when passive mode is enabled:
+
+ * Automatic failover in the `mariadbmon` module
+ * Automatic rejoin in the `mariadbmon` module
+ * Launching of monitor scripts
+
+**NOTE:** Even if MaxScale is in passive mode, it will still accept clients and
+  route any traffic sent to it. The **only** operations affected by the passive
+  mode are the ones listed above.
+
 #### `ms_timestamp`
 
 Enable or disable the high precision timestamps in logfiles. Enabling this adds

Documentation/Release-Notes/MaxScale-2.2.2-Release-Notes.md

@@ -1,4 +1,4 @@
-# MariaDB MaxScale 2.2.2 Release Notes
+# MariaDB MaxScale 2.2.2 Release Notes -- 2018-02-19
 
 Release 2.2.2 is a GA release.
 

Documentation/Tutorials/MaxScale-Failover-with-Keepalived-and-MaxCtrl.md

@@ -1,4 +1,4 @@
-# Failover with Keepalived
+# MaxScale Failover with Keepalived and MaxCtrl
 
 ## Introduction
 

query_classifier/qc_sqlite/qc_sqlite.cc

@@ -3603,7 +3603,7 @@ static void log_invalid_data(GWBUF* query, const char* message)
                 length = (int)GWBUF_LENGTH(query) - MYSQL_HEADER_LEN - 1;
             }
 
-            MXS_INFO("Parsing the query failed, %s: %*s", message, length, sql);
+            MXS_INFO("Parsing the query failed, %s: %.*s", message, length, sql);
         }
     }
 }