Merge branch 'release-1.0GA' into MAX-324

server/MaxScale_template.cnf

@@ -31,7 +31,7 @@ threads=4
 #	backend_write_timeout=<timeout in seconds>
 #	backend_read_timeout=<timeout in seconds>
 #
-## mysql_monitor specific options:
+## MySQL monitor-specific options:
 #
 # Enable detection of replication slaves lag via replication_heartbeat 
 # table - optional.
@@ -43,6 +43,13 @@ threads=4
 #
 # 	detect_stale_master=[1|0] (default 0)
 #
+## Galera monitor-specific options:
+#
+# If disable_master_failback is not set, recovery of previously failed master 
+# causes mastership to be switched back to it. Enabling the option prevents it.
+#
+#	disable_master_failback=[0|1] (default 0)
+#
 ## Examples:
 
 [MySQL Monitor]
@@ -65,6 +72,7 @@ servers=server1,server2,server3
 user=myuser
 passwd=mypwd
 monitor_interval=10000
+disable_master_failback=1
 
 ## Filter definition
 #

server/modules/protocol/maxscaled.c

@@ -374,8 +374,8 @@ int                     rc;
         rc = listen(listener->fd, SOMAXCONN);
         
         if (rc == 0) {
-		LOGIF(LD, (skygw_log_write(
-                           LOGFILE_DEBUG,
+		LOGIF(LM, (skygw_log_write(
+                           LOGFILE_MESSAGE,
                     	"Listening maxscale connections at %s\n",
                     	config)));
         } else {

server/modules/protocol/mysql_common.c

@@ -577,8 +577,8 @@ int gw_send_authentication_to_backend(
 	dcb = conn->owner_dcb;
         final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
 
-	/** Copy client's flags to backend */
-	final_capabilities |= conn->client_capabilities;
+	/** Copy client's flags to backend but with the known capabilities mask */
+	final_capabilities |= (conn->client_capabilities & GW_MYSQL_CAPABILITIES_CLIENT);
 
 	/* get charset the client sent and use it for connection auth */
 	charset = conn->charset;