From 39b4928f29ffd3e169bcc1dbdec12cff023e91d1 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 29 Apr 2015 20:45:42 +0300
Subject: [PATCH 01/35] Switched back to old log names for 1.1 compability.

---
 log_manager/log_manager.cc | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 05f5044c6..8e6b28c2d 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -80,6 +80,9 @@ ssize_t log_ses_count[LOGFILE_LAST] = {0};
  */
 #define MAX_LOGSTRLEN BUFSIZ
 
+/** Use the skygw_ prefix, only for 1.1 compatible builds*/
+#define OLD_LOGNAMES
+
 /**
  * Path to directory in which all files are stored to shared memory
  * by the OS.
@@ -308,7 +311,11 @@ const char* get_suffix_default(void)
 
 const char* get_debug_prefix_default(void)
 {
-        return "debug";
+#ifdef OLD_LOGNAMES
+    return "skygw_debug";
+#else
+    return "debug";
+#endif
 }
 
 const char* get_debug_suffix_default(void)
@@ -318,7 +325,11 @@ const char* get_debug_suffix_default(void)
 
 const char* get_trace_prefix_default(void)
 {
-        return "trace";
+#ifdef OLD_LOGNAMES
+    return "skygw_trace";
+#else
+    return "trace";
+#endif
 }
 
 const char* get_trace_suffix_default(void)
@@ -328,7 +339,11 @@ const char* get_trace_suffix_default(void)
 
 const char* get_msg_prefix_default(void)
 {
-        return "messages";
+#ifdef OLD_LOGNAMES
+    return "skygw_msg";
+#else
+    return "messages";
+#endif
 }
 
 const char* get_msg_suffix_default(void)
@@ -338,7 +353,11 @@ const char* get_msg_suffix_default(void)
 
 const char* get_err_prefix_default(void)
 {
-        return "error";
+#ifdef OLD_LOGNAMES
+    return "skygw_err";
+#else
+    return "error";
+#endif
 }
 
 const char* get_err_suffix_default(void)

From c3dbda9ffdb85bb682603f9ea0cdfc703222e37b Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 10:58:35 +0300
Subject: [PATCH 02/35] Changed all atoi calls to config_truth_value when they
 were used to generate boolean values.

---
 server/core/config.c              | 14 +++++++-------
 server/modules/filter/qlafilter.c |  2 +-
 server/modules/filter/slavelag.c  |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/core/config.c b/server/core/config.c
index 390e3153c..764a606c8 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -1308,7 +1308,7 @@ int i;
         }
 	else if (strcmp(name, "ms_timestamp") == 0)
 	{
-		skygw_set_highp(atoi(value));
+		skygw_set_highp(config_truth_value(value));
 	}
 	else
 	{
@@ -1316,7 +1316,7 @@ int i;
 		{
 			if (strcasecmp(name, lognames[i].logname) == 0)
 			{
-				if (atoi(value))
+				if (config_truth_value(value))
 					skygw_log_enable(lognames[i].logfile);
 				else
 					skygw_log_disable(lognames[i].logfile);
@@ -1495,10 +1495,10 @@ SERVER			*server;
                                                                user,
                                                                auth);
 						if (enable_root_user)
-							serviceEnableRootUser(service, atoi(enable_root_user));
+							serviceEnableRootUser(service, config_truth_value(enable_root_user));
 
 						if (connection_timeout)
-							serviceSetTimeout(service, atoi(connection_timeout));
+							serviceSetTimeout(service, config_truth_value(connection_timeout));
 
 
                                                 if(auth_all_servers)
@@ -1511,7 +1511,7 @@ SERVER			*server;
 						if (allow_localhost_match_wildcard_host)
 							serviceEnableLocalhostMatchWildcardHost(
 								service,
-								atoi(allow_localhost_match_wildcard_host));
+								config_truth_value(allow_localhost_match_wildcard_host));
                                                 
                                                 /** Read, validate and set max_slave_connections */        
                                                 max_slave_conn_str = 
@@ -1651,7 +1651,7 @@ SERVER			*server;
                                                                user,
                                                                auth);
 						if (enable_root_user)
-							serviceEnableRootUser(obj->element, atoi(enable_root_user));
+							serviceEnableRootUser(obj->element, config_truth_value(enable_root_user));
 
 						if (connection_timeout)
 							serviceSetTimeout(obj->element, atoi(connection_timeout));
@@ -1659,7 +1659,7 @@ SERVER			*server;
 						if (allow_localhost_match_wildcard_host)
 							serviceEnableLocalhostMatchWildcardHost(
 								obj->element,
-								atoi(allow_localhost_match_wildcard_host));
+								config_truth_value(allow_localhost_match_wildcard_host));
                                         }
 				}
 			}
diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c
index c9af0a839..5362cf61e 100644
--- a/server/modules/filter/qlafilter.c
+++ b/server/modules/filter/qlafilter.c
@@ -95,7 +95,7 @@ static FILTER_OBJECT MyObject = {
  * are logged.
  *
  * To this base a session number is attached such that each session will
- * have a nique name.
+ * have a unique name.
  */
 typedef struct {
 	int	sessions;	/* The count of sessions */
diff --git a/server/modules/filter/slavelag.c b/server/modules/filter/slavelag.c
index c12d7a2a7..eb6b9536d 100644
--- a/server/modules/filter/slavelag.c
+++ b/server/modules/filter/slavelag.c
@@ -41,10 +41,10 @@ extern __thread log_info_t tls_log_info;
  * Two optional parameters that define the behavior after a data modifying query
  * is executed:
  *
- *	count=<number of queries>   Queries to route to master after data modification.
- *	time=<time period>	    	Seconds to wait before queries are routed to slaves.
- *	match=<regex>				Regex for matching
- *  ignore=<regex>				Regex for ignoring
+ *      count=<number of queries>   Queries to route to master after data modification.
+ *      time=<time period>          Seconds to wait before queries are routed to slaves.
+ *      match=<regex>               Regex for matching
+ *      ignore=<regex>              Regex for ignoring
  *
  * The filter also has two options: @c case, which makes the regex case-sensitive, and @c ignorecase, which does the opposite.
  * Date		Who		Description

From c7ed9e061dcb78c62006b15a3027771b8a665d9f Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 11:13:49 +0300
Subject: [PATCH 03/35] Updated Configuration Guide with a note about conflicts
 when multiple monitors monitor the same set of servers.

---
 Documentation/Getting-Started/Configuration-Guide.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md
index 5ce081a82..02048cdaa 100644
--- a/Documentation/Getting-Started/Configuration-Guide.md
+++ b/Documentation/Getting-Started/Configuration-Guide.md
@@ -410,6 +410,8 @@ In order for the various router modules to function correctly they require infor
 
 Monitors are defined in much the same way as other elements in the configuration file, with the section name being the name of the monitor instance and the type being set to monitor.
 
+This is an example configuration of the MySQL monitor module. It is intended for Master-Slave replication clusters and allows for replication lag detection.
+
 ```
 [MySQL Monitor]
 type=monitor
@@ -425,7 +427,11 @@ backend_write_timeout=2
 # mysqlmon specific options
 detect_replication_lag=0
 detect_stale_master=0
+```
 
+Here is an example configuration of the Galera cluster monitor. It detects when nodes are in sync and also assigns master and slave roles to nodes within MaxScale, allowing it to be used with modules designed for Master-Slave replication clusters.
+
+```
 [Galera Monitor]
 type=monitor
 module=galeramon
@@ -450,6 +456,8 @@ The module parameter defines the name of the loadable module that implements the
 
 The servers parameter is a comma separated list of server names to monitor, these are the names defined elsewhere in the configuration file. The set of servers monitored by a single monitor need not be the same as the set of servers used within any particular server, a single monitor instance may monitor servers in multiple servers.
 
+Multiple monitors monitoring the same servers should be avoided. They can possibly make the whole cluster inoperable and a good example is the mixed use of the MySQL and the Galera monitors. The MySQL monitor requires a working Master-Slave replication for it to assign the Master and Slave roles inside MaxScale but the Galera monitor only looks for Galera specific status variables. These two monitors will cause a conflict when one tries to clear server states it sees as valid while the other is simultaneously setting new states to the rest of the servers.
+
 #### `user`
 
 The user parameter defines the username that the monitor will use to connect to the monitored databases. Depending on the monitoring module used this user will require specific privileges in order to determine the state of the nodes, details of those privileges can be found in the sections on each of the monitor modules.

From 0dc10230de9460b155f64507302a50b3db426351 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 11:28:07 +0300
Subject: [PATCH 04/35] Fix to bug MXS-25 A failed master no longer generates
 the "Info: A Master Server is now available" message.

---
 server/modules/monitor/mysql_mon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 9945086fb..d9e6d1d5d 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -796,7 +796,7 @@ int log_no_master = 1;
 			mon_status_changed(root_master) && 
 			!(root_master->server->status & SERVER_STALE_STATUS)) 
 		{
-			if (root_master->pending_status & (SERVER_MASTER)) {
+			if (root_master->pending_status & (SERVER_MASTER) && SERVER_IS_RUNNING(root_master->server)) {
 				if (!(root_master->mon_prev_status & SERVER_STALE_STATUS) && 
 					!(root_master->server->status & SERVER_MAINT)) 
 				{

From 23123c9781974be58ea118cbfc5f783478f7d820 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 11:36:33 +0300
Subject: [PATCH 05/35] Fixed LSB compatible init.d script missing reload
 functionality.

---
 etc/ubuntu/init.d/maxscale.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/ubuntu/init.d/maxscale.in b/etc/ubuntu/init.d/maxscale.in
index caf7d1408..4d9ac1bed 100755
--- a/etc/ubuntu/init.d/maxscale.in
+++ b/etc/ubuntu/init.d/maxscale.in
@@ -77,6 +77,8 @@ stop() {
 
 reload() {
         log_daemon_msg "Reloading MaxScale"
+        
+        kill -HUP $(cat $MAXSCALE_PIDFILE)
 
         log_end_msg $?
 }

From 7c81de663352463cf69e1bede8f7d961f6af4107 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 11:39:24 +0300
Subject: [PATCH 06/35] Added a more descriptive warning when building MaxScale
 with source built MariaDB server.

---
 cmake/FindMySQL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 7aba9225b..cf873eb7d 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -30,7 +30,7 @@ message(STATUS "MySQL version: ${MYSQL_VERSION}")
 message(STATUS "MySQL provider: ${MYSQL_PROVIDER}")
 
 if(NOT MYSQL_PROVIDER STREQUAL "MariaDB")
-message(WARNING "Not using MariaDB server.")
+message(WARNING "Not using a release version of MariaDB server.")
 endif()
 if(MYSQL_VERSION VERSION_LESS 5.5.41)
 message(WARNING "MySQL version is ${MYSQL_VERSION}. Minimum supported version is 5.5.41.")

From 56a2c2423376a6a6371763883a8111c2706915d1 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 30 Apr 2015 11:42:56 +0300
Subject: [PATCH 07/35] Added even more clarification to the non-release
 warning in FindMySQL.cmake

---
 cmake/FindMySQL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index cf873eb7d..43aec0bfa 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -30,7 +30,7 @@ message(STATUS "MySQL version: ${MYSQL_VERSION}")
 message(STATUS "MySQL provider: ${MYSQL_PROVIDER}")
 
 if(NOT MYSQL_PROVIDER STREQUAL "MariaDB")
-message(WARNING "Not using a release version of MariaDB server.")
+message(WARNING "Not using a release version of MariaDB server. If this is intentional, please ignore this warning. Otherwise make sure the right libraries are installed and CMake finds the right libraries.")
 endif()
 if(MYSQL_VERSION VERSION_LESS 5.5.41)
 message(WARNING "MySQL version is ${MYSQL_VERSION}. Minimum supported version is 5.5.41.")

From 066c1a3c6e1354c9d3980358f5f67429df61986d Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 5 May 2015 13:45:24 +0300
Subject: [PATCH 08/35] Added a warning about multiple monitors monitoring the
 same servers.

---
 server/core/config.c       | 18 +++++++++++++++++-
 server/include/hashtable.h |  6 +++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/server/core/config.c b/server/core/config.c
index 764a606c8..4babcfdaa 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -301,7 +301,15 @@ process_config_context(CONFIG_CONTEXT *context)
 {
 CONFIG_CONTEXT		*obj;
 int			error_count = 0;
+HASHTABLE* monitorhash;
 
+if((monitorhash = hashtable_alloc(5,simple_str_hash,strcmp)) == NULL)
+{
+    skygw_log_write(LOGFILE_ERROR,"Error: Failed to allocate ,onitor configuration check hashtable.");
+    return 0;
+}
+
+hashtable_memory_fns(monitorhash,strdup,NULL,free,NULL);
 	/**
 	 * Process the data and create the services and servers defined
 	 * in the data.
@@ -953,6 +961,13 @@ int			error_count = 0;
                                                             obj->element && obj1->element)
                                                         {
 								found = 1;
+								if(hashtable_add(monitorhash,obj1->object,"") == 0)
+								{
+								    skygw_log_write(LOGFILE_ERROR,
+									     "Warning: Multiple monitors are monitoring server [%s]. "
+									    "This will cause undefined behavior.",
+									     obj1->object);
+								}
 								monitorAddServer(
                                                                         obj->element,
                                                                         obj1->element);
@@ -1013,7 +1028,8 @@ int			error_count = 0;
 		obj = obj->next;
 	} /*< while */
 	/** TODO: consistency check function */
-        
+
+	hashtable_free(monitorhash);
         /**
          * error_count += consistency_checks();
          */
diff --git a/server/include/hashtable.h b/server/include/hashtable.h
index a9878e3e2..26e44b799 100644
--- a/server/include/hashtable.h
+++ b/server/include/hashtable.h
@@ -96,7 +96,11 @@ HASHTABLE		*hashtable_alloc_flat(HASHTABLE* target,
 						int (*hashfn)(),
 						int (*cmpfn)());
 				/**< Allocate a hashtable */
-extern void		hashtable_memory_fns(HASHTABLE *, HASHMEMORYFN, HASHMEMORYFN, HASHMEMORYFN, HASHMEMORYFN);
+extern void		hashtable_memory_fns(HASHTABLE   *table,
+                                            HASHMEMORYFN kcopyfn,
+                                            HASHMEMORYFN vcopyfn,
+                                            HASHMEMORYFN kfreefn,
+                                            HASHMEMORYFN vfreefn);
 				/**< Provide an interface to control key/value memory
 				 * manipulation
 				 */

From 97c96b114122a671878a97cfbaa72dfba0dc7967 Mon Sep 17 00:00:00 2001
From: counterpoint <counterpoint@aliro.org>
Date: Tue, 5 May 2015 11:07:23 +0100
Subject: [PATCH 09/35] Correct date in revision history, add to revision
 history for disableMasterRoleSetting.

---
 server/modules/monitor/galera_mon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index ee93eb3bf..d73e1cc9a 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -32,7 +32,8 @@
  * 24/06/14	Massimiliano Pinto	Added depth level 0 for each node
  * 30/10/14	Massimiliano Pinto	Added disableMasterFailback feature
  * 10/11/14	Massimiliano Pinto	Added setNetworkTimeout for connect,read,write
- * 20/05/15	Guillaume Lefranc	Added availableWhenDonor feature
+ * 20/04/15	Guillaume Lefranc	Added availableWhenDonor feature
+ * 22/04/15     Martin Brampton         Addition of disableMasterRoleSetting
  *
  * @endverbatim
  */

From c2c318a95d37b6a18c840fab2ac5dfcfdc64faf0 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 4 May 2015 20:26:32 +0300
Subject: [PATCH 10/35] Added a warning for bad boolean configuration values.

---
 server/core/config.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/core/config.c b/server/core/config.c
index 4babcfdaa..1b3cdc16f 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -2049,15 +2049,18 @@ bool config_set_qualified_param(
 int
 config_truth_value(char *str)
 {
-	if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0 || strcasecmp(str, "yes") == 0)
+	if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0 ||
+	 strcasecmp(str, "yes") == 0 || strcasecmp(str, "1") == 0)
 	{
 		return 1;
 	}
-	if (strcasecmp(str, "false") == 0 || strcasecmp(str, "off") == 0 || strcasecmp(str, "no") == 0)
+	if (strcasecmp(str, "false") == 0 || strcasecmp(str, "off") == 0 ||
+	 strcasecmp(str, "no") == 0|| strcasecmp(str, "0") == 0)
 	{
 		return 0;
 	}
-	return atoi(str);
+	skygw_log_write(LOGFILE_ERROR,"Error: Not a boolean value: %s",str);
+	return -1;
 }
 
 

From 8e4a5ce807436895a6e29392865ac306bea130d8 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 4 May 2015 07:04:31 +0300
Subject: [PATCH 11/35] Moved common sharding functions to a separate file.

---
 server/modules/include/sharding_common.h      |  18 ++
 server/modules/routing/CMakeLists.txt         |  10 +-
 .../routing/schemarouter/CMakeLists.txt       |  11 +
 .../routing/schemarouter/schemarouter.c       | 228 +++---------------
 .../routing/schemarouter/sharding_common.c    | 161 +++++++++++++
 .../routing/schemarouter/shardrouter.c        | 212 ++--------------
 server/modules/routing/schemarouter/svcconn.c |  78 ++++++
 7 files changed, 320 insertions(+), 398 deletions(-)
 create mode 100644 server/modules/include/sharding_common.h
 create mode 100644 server/modules/routing/schemarouter/CMakeLists.txt
 create mode 100644 server/modules/routing/schemarouter/sharding_common.c
 create mode 100644 server/modules/routing/schemarouter/svcconn.c

diff --git a/server/modules/include/sharding_common.h b/server/modules/include/sharding_common.h
new file mode 100644
index 000000000..a401d2e31
--- /dev/null
+++ b/server/modules/include/sharding_common.h
@@ -0,0 +1,18 @@
+#ifndef _SHARDING_COMMON_HG
+#define _SHARDING_COMMON_HG
+
+#include <poll.h>
+#include <buffer.h>
+#include <modutil.h>
+#include <mysql_client_server_protocol.h>
+#include <hashtable.h>
+#include <log_manager.h>
+#include <query_classifier.h>
+
+bool extract_database(GWBUF* buf, char* str);
+void create_error_reply(char* fail_str,DCB* dcb);
+bool change_current_db(MYSQL_session* mysql_session,
+			      HASHTABLE* dbhash,
+			      GWBUF* buf);
+
+#endif
diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt
index 77abe6cd1..02535b7b9 100644
--- a/server/modules/routing/CMakeLists.txt
+++ b/server/modules/routing/CMakeLists.txt
@@ -5,14 +5,6 @@ if(BUILD_TESTS)
   install(TARGETS testroute DESTINATION modules)
 endif()
 
-add_library(schemarouter SHARED schemarouter/schemarouter.c)
-target_link_libraries(schemarouter log_manager utils query_classifier)
-install(TARGETS schemarouter DESTINATION modules)
-
-add_library(shardrouter SHARED schemarouter/shardrouter.c)
-target_link_libraries(shardrouter log_manager utils query_classifier)
-install(TARGETS shardrouter DESTINATION modules)
-
 add_library(readconnroute SHARED readconnroute.c)
 target_link_libraries(readconnroute log_manager utils)
 install(TARGETS readconnroute DESTINATION modules)
@@ -26,7 +18,7 @@ target_link_libraries(cli log_manager utils)
 install(TARGETS cli DESTINATION modules)
 
 add_subdirectory(readwritesplit)
-add_subdirectory(schemarouter/test)
+add_subdirectory(schemarouter)
 if(BUILD_BINLOG)
   add_subdirectory(binlog)
 endif()
diff --git a/server/modules/routing/schemarouter/CMakeLists.txt b/server/modules/routing/schemarouter/CMakeLists.txt
new file mode 100644
index 000000000..70e6348af
--- /dev/null
+++ b/server/modules/routing/schemarouter/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_library(schemarouter SHARED schemarouter.c sharding_common.c)
+target_link_libraries(schemarouter log_manager utils query_classifier)
+install(TARGETS schemarouter DESTINATION modules)
+
+add_library(shardrouter SHARED shardrouter.c svcconn.c sharding_common.c)
+target_link_libraries(shardrouter log_manager utils query_classifier)
+install(TARGETS shardrouter DESTINATION modules)
+
+if(BUILD_TESTS)
+  add_subdirectory(test)
+endif()
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index 2dfe7ddfb..78a6b5d4a 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <router.h>
 #include <schemarouter.h>
+#include <sharding_common.h>
 #include <secrets.h>
 #include <mysql.h>
 #include <skygw_utils.h>
@@ -208,12 +209,6 @@ static ROUTER_INSTANCE* instances;
 static int hashkeyfun(void* key);
 static int hashcmpfun (void *, void *);
 
-static bool change_current_db(
-	ROUTER_INSTANCE*   inst,
-	ROUTER_CLIENT_SES* rses,
-	GWBUF*             buf);
-
-
 static int hashkeyfun(void* key)
 {
   if(key == NULL){
@@ -250,7 +245,7 @@ char* get_lenenc_str(void* data, int* len)
 {
     unsigned char* ptr = (unsigned char*)data;
     char* rval;
-    long size, offset;
+    unsigned long size, offset;
 
     if(data == NULL || len == NULL)
     {
@@ -279,9 +274,14 @@ char* get_lenenc_str(void* data, int* len)
             offset = 3;
             break;
         case 0xfe:
-            size = *ptr + ((*(ptr + 2) << 8)) + (*(ptr + 3) << 16) +
-                    (*(ptr + 4) << 24) + (*(ptr + 5) << 32) + (*(ptr + 6) << 40) +
-                    (*(ptr + 7) << 48) + (*(ptr + 8) << 56);
+            size = *ptr +
+		    ((*(ptr + 2) << 8)) +
+		    (*(ptr + 3) << 16) +
+                    (*(ptr + 4) << 24) +
+		    ((unsigned long)*(ptr + 5) << 32) +
+		    ((unsigned long)*(ptr + 6) << 40) +
+                    ((unsigned long)*(ptr + 7) << 48) +
+		    ((unsigned long)*(ptr + 8) << 56);
             offset = 8;
             break;
         default:
@@ -1837,7 +1837,7 @@ static int routeQuery(
         skygw_query_type_t qtype          = QUERY_TYPE_UNKNOWN;
         mysql_server_cmd_t packet_type;
         uint8_t*           packet;
-        int                ret            = 0;
+        int                i,ret            = 0;
         DCB*               target_dcb     = NULL;
         ROUTER_INSTANCE*   inst = (ROUTER_INSTANCE *)instance;
         ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES *)router_session;
@@ -1847,7 +1847,8 @@ static int routeQuery(
 	bool           	   succp          = false;
 	char* tname = NULL;
 	GWBUF*  querybuf = qbuf;
-
+	char db[MYSQL_DATABASE_MAXLEN + 1];
+	char errbuf[26+MYSQL_DATABASE_MAXLEN];
         CHK_CLIENT_RSES(router_cli_ses);
 
         /** Dirty read for quick check if router is closed. */
@@ -2020,12 +2021,25 @@ static int routeQuery(
         if (packet_type == MYSQL_COM_INIT_DB ||
 	    op == QUERY_OP_CHANGE_DB)
 	{
-		if (!(change_successful = change_current_db(inst, router_cli_ses, querybuf)))
+	    if (!(change_successful = change_current_db(router_cli_ses->rses_mysql_session,
+						     router_cli_ses->dbhash,
+						     querybuf)))
+	    {
+		extract_database(querybuf,db);
+		snprintf(errbuf,25+MYSQL_DATABASE_MAXLEN,"Unknown database: %s",db);
+		for(i = 0;i<router_cli_ses->rses_nbackends;i++)
 		{
-			LOGIF(LE, (skygw_log_write_flush(
-				LOGFILE_ERROR,
-				"Error : Changing database failed.")));
+		    if(SERVER_IS_RUNNING(router_cli_ses->rses_backend_ref[i].bref_backend->backend_server))
+		    {
+			create_error_reply(errbuf,router_cli_ses->rses_backend_ref[i].bref_dcb);
+			break;
+		    }
 		}
+
+		LOGIF(LE, (skygw_log_write_flush(
+			LOGFILE_ERROR,
+						 "Error : Changing database failed.")));
+	    }
 	}
 
 	if(QUERY_IS_TYPE(qtype, QUERY_TYPE_SHOW_DATABASES))
@@ -2755,8 +2769,7 @@ static void clientReply (
         /** There is one pending session command to be executed. */
         if (sescmd_cursor_is_active(scur)) 
         {
-                bool succp;
-                
+
                 LOGIF(LT, (skygw_log_write(
                         LOGFILE_TRACE,
                         "Backend %s:%d processed reply and starts to execute "
@@ -2764,9 +2777,7 @@ static void clientReply (
                         bref->bref_backend->backend_server->name,
                         bref->bref_backend->backend_server->port)));
                 
-                succp = execute_sescmd_in_backend(bref);
-                
-                ss_dassert(succp);
+                execute_sescmd_in_backend(bref);
         }
 	else if (bref->bref_pending_cmd != NULL) /*< non-sescmd is waiting to be routed */
 	{
@@ -4320,8 +4331,6 @@ router_handle_state_switch(
 {
     backend_ref_t* bref;
     int rc = 1;
-    ROUTER_CLIENT_SES* rses;
-    SESSION* ses;
     SERVER* srv;
     
     CHK_DCB(dcb);
@@ -4334,12 +4343,7 @@ router_handle_state_switch(
     {
         goto return_rc;
     }
-    ses = dcb->session;
-    CHK_SESSION(ses);
 
-    rses = (ROUTER_CLIENT_SES *) dcb->session->router_session;
-    CHK_CLIENT_RSES(rses);
- 
     switch(reason)
     {
     case DCB_REASON_NOT_RESPONDING:
@@ -4369,172 +4373,4 @@ static sescmd_cursor_t* backend_ref_get_sescmd_cursor (
         return scur;
 }
 
-/**
- * Read new database name from MYSQL_COM_INIT_DB packet, check that it exists
- * in the hashtable and copy its name to MYSQL_session.
- * 
- * @param inst	Router instance
- * @param rses	Router client session
- * @param buf	Query buffer
- * 
- * @return true if new database is set, false if non-existent database was tried
- * to be set
- */
-static bool change_current_db(
-	ROUTER_INSTANCE*   inst,
-	ROUTER_CLIENT_SES* rses,
-	GWBUF*             buf)
-{
-	bool	 succp;
-	uint8_t* packet;
-	unsigned int plen;
-	int 	 message_len;
-	char*	 fail_str,*target;
-	
-	if(GWBUF_LENGTH(buf) <= MYSQL_DATABASE_MAXLEN - 5)
-	{
-		packet = GWBUF_DATA(buf);
-		plen = gw_mysql_get_byte3(packet) - 1;
 
-		/** Copy database name from MySQL packet to session */
-		if(query_classifier_get_operation(buf) == QUERY_OP_CHANGE_DB)
-		{
-		    char* query = modutil_get_SQL(buf);
-		    char *saved,*tok;
-
-		    tok = strtok_r(query," ;",&saved);
-		    if(tok == NULL || strcasecmp(tok,"use") != 0)
-		    {
-			skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
-			free(query);
-			message_len = 25 + MYSQL_DATABASE_MAXLEN;
-			fail_str = calloc(1, message_len+1);
-			snprintf(fail_str,
-				message_len,
-				"Unknown database '%s'",
-				(char*)rses->rses_mysql_session->db);
-			rses->rses_mysql_session->db[0] = '\0';
-			succp = false;
-			goto reply_error;
-		    }
-
-		    tok = strtok_r(NULL," ;",&saved);
-		    if(tok == NULL)
-		    {
-			skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
-			free(query);
-			message_len = 25 + MYSQL_DATABASE_MAXLEN;
-			fail_str = calloc(1, message_len+1);
-			snprintf(fail_str,
-				message_len,
-				"Unknown database '%s'",
-				(char*)rses->rses_mysql_session->db);
-			rses->rses_mysql_session->db[0] = '\0';
-			succp = false;
-			goto reply_error;
-		    }
-
-		    strncpy(rses->rses_mysql_session->db,tok,MYSQL_DATABASE_MAXLEN);
-		    free(query);
-		    query = NULL;
-		    
-		}
-		else
-		{
-		    memcpy(rses->rses_mysql_session->db,packet + 5,plen);
-		    memset(rses->rses_mysql_session->db + plen,0,1);
-                }
-                skygw_log_write(LOGFILE_TRACE,"schemarouter: INIT_DB with database '%s'",
-                                rses->rses_mysql_session->db);
-		/**
-		 * Update the session's active database only if it's in the hashtable.
-		 * If it isn't found, send a custom error packet to the client.
-		 */
-
-                
-		if((target = (char*)hashtable_fetch(
-			rses->dbhash,
-			(char*)rses->rses_mysql_session->db)) == NULL)
-		{			
-			
-			/** Create error message */
-			message_len = 25 + MYSQL_DATABASE_MAXLEN;
-			fail_str = calloc(1, message_len+1);
-			snprintf(fail_str, 
-				message_len, 
-				"Unknown database '%s'", 
-				(char*)rses->rses_mysql_session->db);
-			rses->rses_mysql_session->db[0] = '\0';			
-			succp = false;
-			goto reply_error;
-		}
-		else
-		{
-                    skygw_log_write(LOGFILE_TRACE,"schemarouter: database is on server: '%s'.",target);
-			succp = true;
-			goto retblock;
-		}
-	}
-	else 
-	{
-		/** Create error message */
-            skygw_log_write_flush(LOGFILE_ERROR,
-                        "schemarouter: failed to change database: Query buffer too large");
-            skygw_log_write_flush(LOGFILE_TRACE,
-                        "schemarouter: failed to change database: Query buffer too large [%d bytes]",GWBUF_LENGTH(buf));
-		message_len = 25 + MYSQL_DATABASE_MAXLEN;
-		fail_str = calloc(1, message_len+1);
-		snprintf(fail_str, 
-			message_len, 
-			"Unknown database '%s'", 
-			(char*)rses->rses_mysql_session->db);
-		succp = false;
-		goto reply_error;
-	}
-reply_error:
-	{
-		GWBUF* errbuf;
-                skygw_log_write_flush(
-				LOGFILE_TRACE,
-				"schemarouter: failed to change database: %s", fail_str);
-		errbuf = modutil_create_mysql_err_msg(1, 0, 1049, "42000", fail_str);
-		free(fail_str);
-		
-                        
-		if (errbuf == NULL)
-		{
-			LOGIF(LE, (skygw_log_write_flush(
-				LOGFILE_ERROR,
-				"Error : Creating buffer for error message failed."))); 
-			goto retblock;			
-		}
-		/** Set flags that help router to identify session commans reply */
-		gwbuf_set_type(errbuf, GWBUF_TYPE_MYSQL);
-		gwbuf_set_type(errbuf, GWBUF_TYPE_SESCMD_RESPONSE);
-		gwbuf_set_type(errbuf, GWBUF_TYPE_RESPONSE_END);
-		/** 
-		* Create an incoming event for randomly selected backend DCB which
-		* will then be notified and replied 'back' to the client.
-		*/
-                DCB *dcb = NULL;
-                int i;
-                for(i = 0;i<rses->rses_nbackends;i++)
-                {
-                    if(rses->rses_backend_ref[i].bref_dcb){
-                        dcb = rses->rses_backend_ref[i].bref_dcb;
-                        break;
-                    }
-                }
-                
-                if(dcb == NULL)
-                {
-                    skygw_log_write_flush(LOGFILE_ERROR,"Error : All backend connections are down.");
-                    return false;
-                }
-		poll_add_epollin_event_to_dcb(rses->dcb_reply, 
-					gwbuf_clone(errbuf));
-		gwbuf_free(errbuf);
-	}
-retblock:
-	return succp;
-}
diff --git a/server/modules/routing/schemarouter/sharding_common.c b/server/modules/routing/schemarouter/sharding_common.c
new file mode 100644
index 000000000..d69b12d02
--- /dev/null
+++ b/server/modules/routing/schemarouter/sharding_common.c
@@ -0,0 +1,161 @@
+/*
+ * This file is distributed as part of the MariaDB Corporation MaxScale.  It is free
+ * software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation,
+ * version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright MariaDB Corporation Ab 2013-2015
+ */
+
+#include <sharding_common.h>
+
+/** Defined in log_manager.cc */
+extern int            lm_enabled_logfiles_bitmask;
+extern size_t         log_ses_count[];
+extern __thread log_info_t tls_log_info;
+
+/**
+ * Extract the database name from a COM_INIT_DB or literal USE ... query.
+ * @param buf Buffer with the database change query
+ * @param str Pointer where the database name is copied
+ * @return True for success, false for failure
+ */
+bool extract_database(GWBUF* buf, char* str)
+{
+     uint8_t* packet;
+    char *saved,*tok,*query = NULL;
+    bool succp = true;
+    unsigned int plen;
+
+    packet = GWBUF_DATA(buf);
+    plen = gw_mysql_get_byte3(packet) - 1;
+
+    /** Copy database name from MySQL packet to session */
+    if(query_classifier_get_operation(buf) == QUERY_OP_CHANGE_DB)
+    {
+	query = modutil_get_SQL(buf);
+	tok = strtok_r(query," ;",&saved);
+	if(tok == NULL || strcasecmp(tok,"use") != 0)
+	{
+	    skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
+	    succp = false;
+	    goto retblock;
+	}
+
+	tok = strtok_r(NULL," ;",&saved);
+	if(tok == NULL)
+	{
+	    skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
+	    succp = false;
+	    goto retblock;
+	}
+
+	strncpy(str,tok,MYSQL_DATABASE_MAXLEN);
+    }
+    else
+    {
+	memcpy(str,packet + 5,plen);
+	memset(str + plen,0,1);
+    }
+    retblock:
+    free(query);
+    return succp;
+}
+
+/**
+ * Create a fake error message from a DCB.
+ * @param fail_str Custom error message
+ * @param dcb DCB to use as the origin of the error
+ */
+void create_error_reply(char* fail_str,DCB* dcb)
+{
+    skygw_log_write_flush(
+	    LOGFILE_TRACE,
+	    "change_current_db: failed to change database: %s", fail_str);
+    GWBUF* errbuf = modutil_create_mysql_err_msg(1, 0, 1049, "42000", fail_str);
+
+    if (errbuf == NULL)
+    {
+	LOGIF(LE, (skygw_log_write_flush(
+		LOGFILE_ERROR,
+		"Error : Creating buffer for error message failed.")));
+	return;
+    }
+    /** Set flags that help router to identify session commands reply */
+    gwbuf_set_type(errbuf, GWBUF_TYPE_MYSQL);
+    gwbuf_set_type(errbuf, GWBUF_TYPE_SESCMD_RESPONSE);
+    gwbuf_set_type(errbuf, GWBUF_TYPE_RESPONSE_END);
+
+    poll_add_epollin_event_to_dcb(dcb,
+				  errbuf);
+}
+
+/**
+ * Read new database name from MYSQL_COM_INIT_DB packet or a literal USE ... COM_QUERY packet, check that it exists
+ * in the hashtable and copy its name to MYSQL_session.
+ *
+ * @param mysql_session The MySQL session structure
+ * @param dbhash Hashtable containing valid databases
+ * @param buf	Buffer containing the database change query
+ *
+ * @return true if new database is set, false if non-existent database was tried
+ * to be set
+ */
+bool change_current_db(MYSQL_session* mysql_session,
+			      HASHTABLE* dbhash,
+			      GWBUF* buf)
+{
+    char* target;
+    bool succp;
+    char db[MYSQL_DATABASE_MAXLEN+1];
+    if(GWBUF_LENGTH(buf) <= MYSQL_DATABASE_MAXLEN - 5)
+    {
+	/** Copy database name from MySQL packet to session */
+	if(!extract_database(buf,db))
+	{
+	    succp = false;
+	    goto retblock;
+	}
+	skygw_log_write(LOGFILE_TRACE,"change_current_db: INIT_DB with database '%s'",
+		 db);
+	/**
+	 * Update the session's active database only if it's in the hashtable.
+	 * If it isn't found, send a custom error packet to the client.
+	 */
+
+	if((target = (char*)hashtable_fetch(dbhash,(char*)db)) == NULL)
+	{
+	    succp = false;
+	    goto retblock;
+	}
+	else
+	{
+	    strncpy(mysql_session->db,db,MYSQL_DATABASE_MAXLEN);
+	    skygw_log_write(LOGFILE_TRACE,"change_current_db: database is on server: '%s'.",target);
+	    succp = true;
+	    goto retblock;
+	}
+    }
+    else
+    {
+	/** Create error message */
+	skygw_log_write_flush(LOGFILE_ERROR,
+			 "change_current_db: failed to change database: Query buffer too large");
+	skygw_log_write_flush(LOGFILE_TRACE,
+			 "change_current_db: failed to change database: Query buffer too large [%d bytes]",GWBUF_LENGTH(buf));
+	succp = false;
+	goto retblock;
+    }
+    
+    retblock:
+    return succp;
+}
diff --git a/server/modules/routing/schemarouter/shardrouter.c b/server/modules/routing/schemarouter/shardrouter.c
index a3c9da3c4..0d0aa6c84 100644
--- a/server/modules/routing/schemarouter/shardrouter.c
+++ b/server/modules/routing/schemarouter/shardrouter.c
@@ -13,8 +13,9 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright MariaDB Corporation Ab 2013-2014
+ * Copyright MariaDB Corporation Ab 2013-2015
  */
+
 #include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
@@ -24,6 +25,7 @@
 
 #include <router.h>
 #include <shardrouter.h>
+#include <sharding_common.h>
 #include <secrets.h>
 #include <mysql.h>
 #include <skygw_utils.h>
@@ -119,9 +121,9 @@ static route_target_t get_shard_route_target(
 
 static uint8_t getCapabilities(ROUTER* inst, void* router_session);
 
-static void subsvc_clear_state(SUBSERVICE* svc,subsvc_state_t state);
-static void subsvc_set_state(SUBSERVICE* svc,subsvc_state_t state);
-static bool get_shard_subsvc(SUBSERVICE** subsvc,ROUTER_CLIENT_SES* session,char* target);
+void subsvc_clear_state(SUBSERVICE* svc,subsvc_state_t state);
+void subsvc_set_state(SUBSERVICE* svc,subsvc_state_t state);
+bool get_shard_subsvc(SUBSERVICE** subsvc,ROUTER_CLIENT_SES* session,char* target);
 
 static ROUTER_OBJECT MyObject = {
     createInstance,
@@ -205,19 +207,6 @@ static void refreshInstance(
                             CONFIG_PARAMETER* param);
 
 static int router_handle_state_switch(DCB* dcb, DCB_REASON reason, void* data);
-/*
-static bool handle_error_new_connection(
-                                        ROUTER_INSTANCE* inst,
-                                        ROUTER_CLIENT_SES* rses,
-                                        DCB* backend_dcb,
-                                        GWBUF* errmsg);
-static void handle_error_reply_client(
-                                      SESSION* ses,
-                                      ROUTER_CLIENT_SES* rses,
-                                      DCB* backend_dcb,
-                                      GWBUF* errmsg);
-*/
-
 
 static SPINLOCK instlock;
 static ROUTER_INSTANCE* instances;
@@ -225,11 +214,6 @@ static ROUTER_INSTANCE* instances;
 static int hashkeyfun(void* key);
 static int hashcmpfun(void *, void *);
 
-static bool change_current_db(
-                              ROUTER_INSTANCE* inst,
-                              ROUTER_CLIENT_SES* rses,
-                              GWBUF* buf);
-
 static int
 hashkeyfun(void* key)
 {
@@ -1191,7 +1175,7 @@ newSession(
     atomic_add(&client_rses->rses_versno, 2);
     ss_dassert(client_rses->rses_versno == 2);
 
-    client_rses->dbhash = hashtable_alloc(100, hashkeyfun, hashcmpfun);
+    client_rses->dbhash = hashtable_alloc(100, simple_str_hash,strcmp);
     hashtable_memory_fns(client_rses->dbhash, (HASHMEMORYFN) strdup,
                          (HASHMEMORYFN) strdup,
                          (HASHMEMORYFN) free,
@@ -1564,7 +1548,7 @@ routeQuery(ROUTER* instance,
     skygw_query_type_t qtype = QUERY_TYPE_UNKNOWN;
     mysql_server_cmd_t packet_type;
     uint8_t* packet;
-    int ret = 1;
+    int i,ret = 1;
     SUBSERVICE* target_subsvc;
     ROUTER_INSTANCE* inst = (ROUTER_INSTANCE *) instance;
     ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES *) router_session;
@@ -1573,7 +1557,10 @@ routeQuery(ROUTER* instance,
     route_target_t route_target = TARGET_UNDEFINED;
     bool succp = false;
     char* tname = NULL;
-    skygw_log_write_flush(LOGFILE_TRACE,"shardrouter: routeQuery");
+    char db[MYSQL_DATABASE_MAXLEN + 1];
+    char errbuf[26+MYSQL_DATABASE_MAXLEN];
+
+    skygw_log_write_flush(LOGFILE_DEBUG,"shardrouter: routeQuery");
     CHK_CLIENT_RSES(router_cli_ses);
 
     /** Dirty read for quick check if router is closed. */
@@ -1714,8 +1701,13 @@ routeQuery(ROUTER* instance,
     
     if(packet_type == MYSQL_COM_INIT_DB)
     {
-        if(!(change_successful = change_current_db(inst, router_cli_ses, querybuf)))
+        if(!(change_successful = change_current_db(router_cli_ses->rses_mysql_session,
+						   router_cli_ses->dbhash,
+						   querybuf)))
         {
+	    extract_database(querybuf,db);
+	    snprintf(errbuf,"Unknown database: %s",db);
+	    create_error_reply(errbuf,router_cli_ses->replydcb);
             LOGIF(LE, (skygw_log_write_flush(
                                              LOGFILE_ERROR,
                                              "Error : Changing database failed.")));
@@ -2066,34 +2058,6 @@ clientReply(
     return;
 }
 
-
-static void
-subsvc_set_state(SUBSERVICE* svc,subsvc_state_t state)
-{
-    if(state & SUBSVC_WAITING_RESULT)
-    {
-
-        /** Increase waiter count */
-       atomic_add(&svc->n_res_waiting, 1);
-    }
-    
-    svc->state |= state;
-}
-
-static void
-subsvc_clear_state(SUBSERVICE* svc,subsvc_state_t state)
-{
-    
-
-    if(state & SUBSVC_WAITING_RESULT)
-    {
-        /** Decrease waiter count */
-        atomic_add(&svc->n_res_waiting, -1);
-    }
-    
-    svc->state &= ~state;
-}
-
 /** 
  * Create a generic router session property strcture.
  */
@@ -2634,8 +2598,7 @@ mysql_sescmd_get_property(
  * capabilities specified, rc > 0 when there are capabilities.
  */
 static uint8_t
-getCapabilities(
-                ROUTER* inst,
+getCapabilities(ROUTER* inst,
                 void* router_session)
 {
     ROUTER_CLIENT_SES* rses = (ROUTER_CLIENT_SES *) router_session;
@@ -2905,37 +2868,7 @@ handleError(
 }
 
 
-static bool 
-get_shard_subsvc(SUBSERVICE** subsvc,ROUTER_CLIENT_SES* session,char* target)
-{
-    int i;
-    
-    if(subsvc == NULL || session == NULL || target == NULL)
-	return false;
 
-    for(i = 0;i<session->n_subservice;i++)
-    {
-        if(strcmp(session->subservice[i]->service->name,target) == 0)
-        {
-            
-            if (SUBSVC_IS_OK(session->subservice[i]))
-            {
-                if(subsvc_is_valid(session->subservice[i])){
-                    *subsvc = session->subservice[i];
-                    return true;
-                }
-                
-                /**
-                 * The service has failed 
-                 */
-                
-                subsvc_set_state(session->subservice[i],SUBSVC_FAILED);
-            }
-        } 
-    }
-    
-    return false;
-}
 /**
  * Finds the subservice who owns this session.
  * @param rses Router client session
@@ -3003,110 +2936,3 @@ return_rc:
     return rc;
 #endif
 }
-
-/**
- * Read new database nbame from MYSQL_COM_INIT_DB packet, check that it exists
- * in the hashtable and copy its name to MYSQL_session.
- * 
- * @param inst	Router instance
- * @param rses	Router client session
- * @param buf	Query buffer
- * 
- * @return true if new database is set, false if non-existent database was tried
- * to be set
- */
-static bool
-change_current_db(
-                  ROUTER_INSTANCE* inst,
-                  ROUTER_CLIENT_SES* rses,
-                  GWBUF* buf)
-{
-    bool succp;
-    uint8_t* packet;
-    unsigned int plen;
-    int message_len;
-    char* fail_str;
-
-    if(GWBUF_LENGTH(buf) <= MYSQL_DATABASE_MAXLEN - 5)
-    {
-        packet = GWBUF_DATA(buf);
-        plen = gw_mysql_get_byte3(packet) - 1;
-
-        /** Copy database name from MySQL packet to session */
-
-        memcpy(rses->rses_mysql_session->db,
-               packet + 5,
-               plen);
-        memset(rses->rses_mysql_session->db + plen, 0, 1);
-
-        /**
-         * Update the session's active database only if it's in the hashtable.
-         * If it isn't found, send a custom error packet to the client.
-         */
-
-        if(hashtable_fetch(
-                           rses->dbhash,
-                           (char*) rses->rses_mysql_session->db) == NULL)
-        {
-
-            /** Create error message */
-            message_len = 25 + MYSQL_DATABASE_MAXLEN;
-            fail_str = calloc(1, message_len + 1);
-            snprintf(fail_str,
-                     message_len,
-                     "Unknown database '%s'",
-                     (char*) rses->rses_mysql_session->db);
-            rses->rses_mysql_session->db[0] = '\0';
-            succp = false;
-            goto reply_error;
-        }
-        else
-        {
-            succp = true;
-            goto retblock;
-        }
-    }
-    else
-    {
-        /** Create error message */
-        message_len = 25 + MYSQL_DATABASE_MAXLEN;
-        fail_str = calloc(1, message_len + 1);
-        snprintf(fail_str,
-                 message_len,
-                 "Unknown database '%s'",
-                 (char*) rses->rses_mysql_session->db);
-        succp = false;
-        goto reply_error;
-    }
-reply_error:
-    {
-        GWBUF* errbuf;
-        skygw_log_write_flush(
-				LOGFILE_TRACE,
-				"shardrouter: failed to change database: %s", fail_str);
-		errbuf = modutil_create_mysql_err_msg(1, 0, 1049, "42000", fail_str);
-        errbuf = modutil_create_mysql_err_msg(1, 0, 1049, "42000", fail_str);
-        free(fail_str);
-
-        if(errbuf == NULL)
-        {
-            LOGIF(LE, (skygw_log_write_flush(
-                                             LOGFILE_ERROR,
-                                             "Error : Creating buffer for error message failed.")));
-            goto retblock;
-        }
-        /** Set flags that help router to identify session commans reply */
-        gwbuf_set_type(errbuf, GWBUF_TYPE_MYSQL);
-        gwbuf_set_type(errbuf, GWBUF_TYPE_SESCMD_RESPONSE);
-        gwbuf_set_type(errbuf, GWBUF_TYPE_RESPONSE_END);
-        /** 
-         * Create an incoming event for randomly selected backend DCB which
-         * will then be notified and replied 'back' to the client.
-         */
-        poll_add_epollin_event_to_dcb(rses->replydcb,
-					gwbuf_clone(errbuf));
-        gwbuf_free(errbuf);
-    }
-retblock:
-    return succp;
-}
diff --git a/server/modules/routing/schemarouter/svcconn.c b/server/modules/routing/schemarouter/svcconn.c
new file mode 100644
index 000000000..2d8b07a2a
--- /dev/null
+++ b/server/modules/routing/schemarouter/svcconn.c
@@ -0,0 +1,78 @@
+/*
+ * This file is distributed as part of the MariaDB Corporation MaxScale.  It is free
+ * software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation,
+ * version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright MariaDB Corporation Ab 2013-2014
+ */
+
+#include <shardrouter.h>
+
+void
+subsvc_set_state(SUBSERVICE* svc,subsvc_state_t state)
+{
+    if(state & SUBSVC_WAITING_RESULT)
+    {
+
+        /** Increase waiter count */
+       atomic_add(&svc->n_res_waiting, 1);
+    }
+    
+    svc->state |= state;
+}
+
+void
+subsvc_clear_state(SUBSERVICE* svc,subsvc_state_t state)
+{
+    
+
+    if(state & SUBSVC_WAITING_RESULT)
+    {
+        /** Decrease waiter count */
+        atomic_add(&svc->n_res_waiting, -1);
+    }
+    
+    svc->state &= ~state;
+}
+
+bool 
+get_shard_subsvc(SUBSERVICE** subsvc,ROUTER_CLIENT_SES* session,char* target)
+{
+    int i;
+    
+    if(subsvc == NULL || session == NULL || target == NULL)
+	return false;
+
+    for(i = 0;i<session->n_subservice;i++)
+    {
+        if(strcmp(session->subservice[i]->service->name,target) == 0)
+        {
+            
+            if (SUBSVC_IS_OK(session->subservice[i]))
+            {
+                if(subsvc_is_valid(session->subservice[i])){
+                    *subsvc = session->subservice[i];
+                    return true;
+                }
+                
+                /**
+                 * The service has failed 
+                 */
+                
+                subsvc_set_state(session->subservice[i],SUBSVC_FAILED);
+            }
+        } 
+    }
+    
+    return false;
+}

From fd1433bba138def3a6c5cbbd5937b5dd2f7ba765 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 11 May 2015 09:11:25 +0300
Subject: [PATCH 12/35] Updated release notes.

---
 Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
index 9ccf7b930..0bcfe95d5 100644
--- a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
@@ -42,7 +42,8 @@ Here is a list of bugs fixed since the release of the 1.1 version of MaxScale. T
 |[MXS-33](https://mariadb.atlassian.net/browse/MXS-33)|bugzillaId-702: CLI: list services command shows negative values for the number of users of a service (Read Service).|
 |[MXS-17](https://mariadb.atlassian.net/browse/MXS-17)|bugzillaId-736: Memory leak while doing read/write splitting|
 |[MXS-30](https://mariadb.atlassian.net/browse/MXS-30)|bugzillaId-487: Buffer manager should not use pointer arithmetic on void*|
-
+|[MXS-81](https://mariadb.atlassian.net/browse/MXS-81)|cmake fails when init scripts are missing|
+|[MXS-127](https://mariadb.atlassian.net/browse/MXS-127)|disable_sescmd_history causes MaxScale to crash under load|
 ## Known Issues
 
 There are a number bugs and known limitations within this version of MaxScale, the most serious of this are listed below.

From 6021fad5ad4dfcc582f295ea3e676434b3b3fdb5 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 11 May 2015 09:26:45 +0300
Subject: [PATCH 13/35] Changed from tables to bullets in bug lists.

---
 .../MaxScale-1.1.1-Release-Notes.md           | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
index 0bcfe95d5..47edcb6c3 100644
--- a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
@@ -22,28 +22,27 @@ Using the password functionality in MaxScale is now a lot easier. Both programs
 
 Here is a list of bugs fixed since the release of the 1.1 version of MaxScale. The bug IDs are from the **[Mariadb Jira](https://mariadb.atlassian.net/)**.
 
-|Bug|Description|
-|---|-----------|
-|[MXS-99](https://mariadb.atlassian.net/browse/MXS-99)|/etc/init.d/maxscale reload doesn't do anything|
-|[MXS-83](https://mariadb.atlassian.net/browse/MXS-83)|linkage fails when system pcre library is recent|
-|[MXS-112](https://mariadb.atlassian.net/browse/MXS-112)|Disable saving of session commands in the readwritesplit and schemarouter modules|
-|[MXS-114](https://mariadb.atlassian.net/browse/MXS-114)|Disable recovery of disconnected slaves|
-|[MXS-73](https://mariadb.atlassian.net/browse/MXS-73)|MaxScale uses nearly 100% CPU |
-|[MXS-36](https://mariadb.atlassian.net/browse/MXS-36)|bugzillaId-671: wrong message if SHOW DATABASES privilege is missing|
-|[MXS-39](https://mariadb.atlassian.net/browse/MXS-39)|bugzillaId-731:Boolean configuration parameters accept inconsistent parameters|
-|[MXS-64](https://mariadb.atlassian.net/browse/MXS-64)|maxkeys and Maxpasswd do not produce informative error output|
-|[MXS-25](https://mariadb.atlassian.net/browse/MXS-25)|bugzillaId-656: MySQL Monitor: claims that Master is available after master failure|
-|[MXS-82](https://mariadb.atlassian.net/browse/MXS-82)|cmake warns when mariadb is compiled without mysql_release|
-|[MXS-69](https://mariadb.atlassian.net/browse/MXS-69)|dbfwfilter should be pessimistic about rule syntax errors|
-|[MXS-98](https://mariadb.atlassian.net/browse/MXS-98)|regexfilter log|
-|[MXS-28](https://mariadb.atlassian.net/browse/MXS-28)|bugzillaId-433: Logging don't include assert information|
-|[MXS-75](https://mariadb.atlassian.net/browse/MXS-75)|"wildcard" rule also blocks COUNT(*)|
-|[MXS-118](https://mariadb.atlassian.net/browse/MXS-118)|Two monitors loaded at the same time result into not working installation|
-|[MXS-33](https://mariadb.atlassian.net/browse/MXS-33)|bugzillaId-702: CLI: list services command shows negative values for the number of users of a service (Read Service).|
-|[MXS-17](https://mariadb.atlassian.net/browse/MXS-17)|bugzillaId-736: Memory leak while doing read/write splitting|
-|[MXS-30](https://mariadb.atlassian.net/browse/MXS-30)|bugzillaId-487: Buffer manager should not use pointer arithmetic on void*|
-|[MXS-81](https://mariadb.atlassian.net/browse/MXS-81)|cmake fails when init scripts are missing|
-|[MXS-127](https://mariadb.atlassian.net/browse/MXS-127)|disable_sescmd_history causes MaxScale to crash under load|
+* [MXS-99](https://mariadb.atlassian.net/browse/MXS-99): /etc/init.d/maxscale reload doesn't do anything
+* [MXS-83](https://mariadb.atlassian.net/browse/MXS-83): linkage fails when system pcre library is recent
+* [MXS-112](https://mariadb.atlassian.net/browse/MXS-112): Disable saving of session commands in the readwritesplit and schemarouter modules
+* [MXS-114](https://mariadb.atlassian.net/browse/MXS-114): Disable recovery of disconnected slaves
+* [MXS-73](https://mariadb.atlassian.net/browse/MXS-73): MaxScale uses nearly 100% CPU 
+* [MXS-36](https://mariadb.atlassian.net/browse/MXS-36): bugzillaId-671: wrong message if SHOW DATABASES privilege is missing
+* [MXS-39](https://mariadb.atlassian.net/browse/MXS-39): bugzillaId-731:Boolean configuration parameters accept inconsistent parameters
+* [MXS-64](https://mariadb.atlassian.net/browse/MXS-64): maxkeys and Maxpasswd do not produce informative error output
+* [MXS-25](https://mariadb.atlassian.net/browse/MXS-25): bugzillaId-656: MySQL Monitor: claims that Master is available after master failure
+* [MXS-82](https://mariadb.atlassian.net/browse/MXS-82): cmake warns when mariadb is compiled without mysql_release
+* [MXS-69](https://mariadb.atlassian.net/browse/MXS-69): dbfwfilter should be pessimistic about rule syntax errors
+* [MXS-98](https://mariadb.atlassian.net/browse/MXS-98): regexfilter log
+* [MXS-28](https://mariadb.atlassian.net/browse/MXS-28): bugzillaId-433: Logging don't include assert information
+* [MXS-75](https://mariadb.atlassian.net/browse/MXS-75): "wildcard" rule also blocks COUNT(*)
+* [MXS-118](https://mariadb.atlassian.net/browse/MXS-118): Two monitors loaded at the same time result into not working installation
+* [MXS-33](https://mariadb.atlassian.net/browse/MXS-33): bugzillaId-702: CLI: list services command shows negative values for the number of users of a service (Read Service).
+* [MXS-17](https://mariadb.atlassian.net/browse/MXS-17): bugzillaId-736: Memory leak while doing read/write splitting
+* [MXS-30](https://mariadb.atlassian.net/browse/MXS-30): bugzillaId-487: Buffer manager should not use pointer arithmetic on void*
+* [MXS-81](https://mariadb.atlassian.net/browse/MXS-81): cmake fails when init scripts are missing
+* [MXS-127](https://mariadb.atlassian.net/browse/MXS-127): disable_sescmd_history causes MaxScale to crash under load
+
 ## Known Issues
 
 There are a number bugs and known limitations within this version of MaxScale, the most serious of this are listed below.

From 9bacf18c59d56d90e33d0e6e21a74a01eb7871b6 Mon Sep 17 00:00:00 2001
From: Rasmus Johansson <razze@iki.fi>
Date: Mon, 11 May 2015 10:06:05 +0300
Subject: [PATCH 14/35] Some changes to the first section of the release notes
 and corrected some typos

Some changes to the first section of the release notes and corrected some typos. Also some smaller edits here and there.
---
 .../Release-Notes/MaxScale-1.1.1-Release-Notes.md  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
index 47edcb6c3..5904346ac 100644
--- a/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.1.1-Release-Notes.md
@@ -2,7 +2,7 @@
 
 ## 1.1 GA
 
-This document details the changes in version 1.1.1 since the release of the 1.1 GA Release of the MaxScale product.
+MaxScale 1.1 is the current stable (GA) release of MaxScale. Version 1.1.1 is mainly a bug fix release introducing fixes, but also introduces some improvements to existing functionality.
 
 ## New Features
 
@@ -20,7 +20,7 @@ Using the password functionality in MaxScale is now a lot easier. Both programs
 
 ## Bug Fixes
 
-Here is a list of bugs fixed since the release of the 1.1 version of MaxScale. The bug IDs are from the **[Mariadb Jira](https://mariadb.atlassian.net/)**.
+Here is a list of bugs fixed since the release of the 1.1.0 version of MaxScale. The bug IDs are from the **[MariaDB Jira](https://mariadb.atlassian.net/)**.
 
 * [MXS-99](https://mariadb.atlassian.net/browse/MXS-99): /etc/init.d/maxscale reload doesn't do anything
 * [MXS-83](https://mariadb.atlassian.net/browse/MXS-83): linkage fails when system pcre library is recent
@@ -45,18 +45,18 @@ Here is a list of bugs fixed since the release of the 1.1 version of MaxScale. T
 
 ## Known Issues
 
-There are a number bugs and known limitations within this version of MaxScale, the most serious of this are listed below.
+There are a number bugs and known limitations within this version of MaxScale, the most serious of these are listed below.
 
-* The Read/Write Splitter is a little too strict when it receives errors from slave servers during execution of session commands. This can result in sessions being terminated in situation in which MaxScale could recover without terminating the sessions.
+* The Read/Write Splitter is a little too strict when it receives errors from slave servers during execution of session commands. This can result in sessions being terminated in situations from which MaxScale could recover without terminating the sessions.
 
-* MaxScale can not manage authentication that uses wildcard matching in hostnames in the mysql.user table of the backend database. The only wildcards that can be used are in IP address entries.
+* MaxScale cannot manage authentication that uses wildcard matching in hostnames in the mysql.user table of the backend database. The only wildcards that can be used are in IP address entries.
 
 * When users have different passwords based on the host from which they connect MaxScale is unable to determine which password it should use to connect to the backend database. This results in failed connections and unusable usernames in MaxScale.
 
 * Binlog Router Plugin is compatible with MySQL 5.6  
   Binlog Router Plugin currently does not work for MariaDB 5.5 and MariaDB 10.0 
 
-* LONGBLOG are currently not supported.
+* LONGBLOG datatype is currently not supported.
 
 * Galera Cluster variables, such as @@wsrep_node_name, are not resolved by the embedded MariaDB parser.
 
@@ -64,7 +64,7 @@ There are a number bugs and known limitations within this version of MaxScale, t
 
 ## Packaging
 
-Both RPM and Debian packages are available for MaxScale in addition to the tar based releases previously distributed we now provide
+Both RPM and Debian packages are available for MaxScale in addition to the tar based releases. Packages are now provided for:
 
 * CentOS/RedHat 5
 

From c1b956af2cb7ba7fc088bef4f3036baf5b030c0b Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 13 May 2015 22:46:05 +0300
Subject: [PATCH 15/35] Fixed a non-static variable causing multiple
 declarations when FAKE_CODE was defined

---
 utils/skygw_debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/skygw_debug.h b/utils/skygw_debug.h
index 89f7a4e00..99f7807fc 100644
--- a/utils/skygw_debug.h
+++ b/utils/skygw_debug.h
@@ -567,7 +567,7 @@ typedef enum skygw_chk_t {
 
 
 #if defined(FAKE_CODE)
-bool conn_open[10240];
+static bool conn_open[10240];
 #endif /* FAKE_CODE */
 
 #endif /* SKYGW_DEBUG_H */

From 8a0b399896bc157668c356ec038fa741701822a1 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 30 Jun 2015 18:50:26 +0300
Subject: [PATCH 16/35] Added code for MySQL 5.1 replication detection.

---
 server/modules/monitor/mysql_mon.c | 651 ++++++++++++++++++-----------
 server/modules/monitor/mysqlmon.h  |   1 +
 2 files changed, 400 insertions(+), 252 deletions(-)

diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 2ba70a499..2fd66766e 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -156,6 +156,7 @@ startMonitor(void *arg, void* opt)
 	handle->detectStaleMaster = 0;
 	handle->master = NULL;
 	handle->script = NULL;
+	handle->mysql51_replication = false;
 	memset(handle->events,false,sizeof(handle->events));
 	spinlock_init(&handle->lock);
     }
@@ -199,6 +200,10 @@ startMonitor(void *arg, void* opt)
 	    else
 		have_events = true;
 	}
+	else if(!strcmp(params->name,"mysql51_only"))
+	{
+	    handle->mysql51_replication = config_truth_value(params->value);
+	}
 	params = params->next;
     }
     if(script_error)
@@ -281,7 +286,281 @@ static void diagnostics(DCB *dcb, void *arg)
     }
     dcb_printf(dcb, "\n");
 }
+/**
+ * Connect to a database
+ * @param mon Monitor
+ * @param database Monitored database
+ * @return true if connection was successful, false if there was an error
+ */
+static inline bool connect_to_db(MONITOR* mon,MONITOR_SERVERS *database)
+{
+    char		  *uname  = mon->user;
+    char              *passwd = mon->password;
+    char *dpwd = decryptPassword(passwd);
+    int  connect_timeout = mon->connect_timeout;
+    int  read_timeout = mon->read_timeout;
+    int  write_timeout = mon->write_timeout;
 
+    if(database->con)
+	mysql_close(database->con);
+    database->con = mysql_init(NULL);
+
+    mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);
+    mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);
+    mysql_options(database->con, MYSQL_OPT_WRITE_TIMEOUT, (void *)&write_timeout);
+
+    return (mysql_real_connect(database->con,
+			       database->server->name,
+			       uname,
+			       dpwd,
+			       NULL,
+			       database->server->port,
+			       NULL,
+			       0) != NULL);
+}
+
+inline void monitor_mysql100_db(MONITOR_SERVERS* database)
+{
+    bool isslave = false;
+    MYSQL_RES* result;
+    MYSQL_ROW row;
+
+    if (mysql_query(database->con, "SHOW ALL SLAVES STATUS") == 0
+	&& (result = mysql_store_result(database->con)) != NULL)
+    {
+	int i = 0;
+	long master_id = -1;
+
+	if(mysql_field_count(database->con) < 42)
+	{
+	    mysql_free_result(result);
+	    skygw_log_write(LE,"Error: \"SHOW ALL SLAVES STATUS\" "
+		    "returned less than the expected amount of columns. Expected 42 columns."
+		    " MySQL Version: %s",version_str);
+	    return;
+	}
+
+	while ((row = mysql_fetch_row(result)))
+	{
+	    /* get Slave_IO_Running and Slave_SQL_Running values*/
+	    if (strncmp(row[12], "Yes", 3) == 0
+	     && strncmp(row[13], "Yes", 3) == 0) {
+		isslave += 1;
+	    }
+
+	    /* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building
+	     * the replication tree, slaves ids will be added to master(s) and we will have at least the
+	     * root master server.
+	     * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
+	     */
+	    if (strncmp(row[12], "Yes", 3) == 0) {
+		/* get Master_Server_Id values */
+		master_id = atol(row[41]);
+		if (master_id == 0)
+		    master_id = -1;
+	    }
+
+	    i++;
+	}
+	/* store master_id of current node */
+	memcpy(&database->server->master_id, &master_id, sizeof(long));
+
+	mysql_free_result(result);
+
+	/* If all configured slaves are running set this node as slave */
+	if (isslave > 0 && isslave == i)
+	    isslave = 1;
+	else
+	    isslave = 0;
+    }
+
+    /* Remove addition info */
+    monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+    monitor_clear_pending_status(database, SERVER_STALE_STATUS);
+
+    /* Please note, the MASTER status and SERVER_SLAVE_OF_EXTERNAL_MASTER
+     * will be assigned in the monitorMain() via get_replication_tree() routine
+     */
+
+    /* Set the Slave Role */
+    if (isslave)
+    {
+	monitor_set_pending_status(database, SERVER_SLAVE);
+	/* Avoid any possible stale Master state */
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    } else {
+	/* Avoid any possible Master/Slave stale state */
+	monitor_clear_pending_status(database, SERVER_SLAVE);
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    }
+}
+
+inline void monitor_mysql55_db(MONITOR_SERVERS* database)
+{
+    bool isslave = false;
+    MYSQL_RES* result;
+    MYSQL_ROW row;
+
+    if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0
+	&& (result = mysql_store_result(database->con)) != NULL)
+    {
+	long master_id = -1;
+	if(mysql_field_count(database->con) < 40)
+	{
+	    mysql_free_result(result);
+	    skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+		    "returned less than the expected amount of columns. Expected 40 columns."
+		    " MySQL Version: %s",version_str);
+	    return;
+	}
+
+	while ((row = mysql_fetch_row(result)))
+	{
+	    /* get Slave_IO_Running and Slave_SQL_Running values*/
+	    if (strncmp(row[10], "Yes", 3) == 0
+	     && strncmp(row[11], "Yes", 3) == 0) {
+		isslave = 1;
+	    }
+
+	    /* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building
+	     * the replication tree, slaves ids will be added to master(s) and we will have at least the
+	     * root master server.
+	     * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
+	     */
+	    if (strncmp(row[10], "Yes", 3) == 0) {
+		/* get Master_Server_Id values */
+		master_id = atol(row[39]);
+		if (master_id == 0)
+		    master_id = -1;
+	    }
+	}
+	/* store master_id of current node */
+	memcpy(&database->server->master_id, &master_id, sizeof(long));
+
+	mysql_free_result(result);
+    }
+
+    /* Remove addition info */
+    monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+    monitor_clear_pending_status(database, SERVER_STALE_STATUS);
+
+    /* Please note, the MASTER status and SERVER_SLAVE_OF_EXTERNAL_MASTER
+     * will be assigned in the monitorMain() via get_replication_tree() routine
+     */
+
+    /* Set the Slave Role */
+    if (isslave)
+    {
+	monitor_set_pending_status(database, SERVER_SLAVE);
+	/* Avoid any possible stale Master state */
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    } else {
+	/* Avoid any possible Master/Slave stale state */
+	monitor_clear_pending_status(database, SERVER_SLAVE);
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    }
+}
+
+inline void monitor_mysql51_db(MONITOR_SERVERS* database)
+{
+    bool isslave = false;
+    MYSQL_RES* result;
+    MYSQL_ROW row;
+
+    if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0
+	&& (result = mysql_store_result(database->con)) != NULL)
+    {
+	if(mysql_field_count(database->con) < 38)
+	{
+	    mysql_free_result(result);
+
+	    skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
+		    "returned less than the expected amount of columns. Expected 38 columns."
+		    " MySQL Version: %s",version_str);
+	    return;
+	}
+
+	while ((row = mysql_fetch_row(result)))
+	{
+	    /* get Slave_IO_Running and Slave_SQL_Running values*/
+	    if (strncmp(row[10], "Yes", 3) == 0
+	     && strncmp(row[11], "Yes", 3) == 0) {
+		isslave = 1;
+	    }
+	}
+	mysql_free_result(result);
+    }
+
+    /* Remove addition info */
+    monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+    monitor_clear_pending_status(database, SERVER_STALE_STATUS);
+
+    /* Please note, the MASTER status and SERVER_SLAVE_OF_EXTERNAL_MASTER
+     * will be assigned in the monitorMain() via get_replication_tree() routine
+     */
+
+    /* Set the Slave Role */
+    if (isslave)
+    {
+	monitor_set_pending_status(database, SERVER_SLAVE);
+	/* Avoid any possible stale Master state */
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    } else {
+	/* Avoid any possible Master/Slave stale state */
+	monitor_clear_pending_status(database, SERVER_SLAVE);
+	monitor_clear_pending_status(database, SERVER_MASTER);
+    }
+}
+
+static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
+{
+    MONITOR_SERVERS* database = mon->databases;
+
+    while(database)
+    {
+	bool ismaster = false;
+	MYSQL_RES* result;
+	MYSQL_ROW row;
+	unsigned long *slaves;
+	int nslaves = 0;
+	if(database->con)
+	{
+	    if (mysql_query(database->con, "SHOW SLAVE HOSTS") == 0
+	     && (result = mysql_store_result(database->con)) != NULL)
+	    {
+		if(mysql_field_count(database->con) < 4)
+		{
+		    mysql_free_result(result);
+		    skygw_log_write(LE,"Error: \"SHOW SLAVE HOSTS\" "
+			    "returned less than the expected amount of columns. Expected 4 columns."
+			    " MySQL Version: %s",version_str);
+		    return;
+		}
+
+		if(mysql_num_rows(result) > 0)
+		{
+		    ismaster = true;
+		    while ((row = mysql_fetch_row(result)))
+		    {
+			/* get Slave_IO_Running and Slave_SQL_Running values*/
+			database->server->slaves[nslaves] = atol(row[0]);
+			nslaves++;
+		    }
+		}
+
+		mysql_free_result(result);
+	    }
+
+	    
+	    /* Set the Slave Role */
+	    if (ismaster)
+	    {
+		monitor_set_pending_status(database, SERVER_MASTER);
+	    }
+	}
+	database = database->next;
+    }
+}
 /**
  * Monitor an individual server
  *
@@ -292,271 +571,135 @@ static void
 monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
 {
     MYSQL_MONITOR* handle = mon->handle;
-MYSQL_ROW	  row;
-MYSQL_RES	  *result;
-int               isslave = 0;
-char		  *uname  = mon->user;
-char              *passwd = mon->password;
-unsigned long int server_version = 0;
-char 		  *server_string;
+    MYSQL_ROW	  row;
+    MYSQL_RES	  *result;
+    int               isslave = 0;
+    char		  *uname  = mon->user;
+    char              *passwd = mon->password;
+    unsigned long int server_version = 0;
+    char 		  *server_string;
 
-        if (database->server->monuser != NULL)
+    if (database->server->monuser != NULL)
+    {
+	uname = database->server->monuser;
+	passwd = database->server->monpw;
+    }
+
+    if (uname == NULL)
+	return;
+
+    /* Don't probe servers in maintenance mode */
+    if (SERVER_IN_MAINT(database->server))
+	return;
+
+    /** Store previous status */
+    database->mon_prev_status = database->server->status;
+
+    if (database->con == NULL || mysql_ping(database->con) != 0)
+    {
+	if(connect_to_db(mon,database))
 	{
-		uname = database->server->monuser;
-		passwd = database->server->monpw;
+	    server_clear_status(database->server, SERVER_AUTH_ERROR);
+	    monitor_clear_pending_status(database, SERVER_AUTH_ERROR);
 	}
-	
-	if (uname == NULL)
-		return;
-        
-	/* Don't probe servers in maintenance mode */
-	if (SERVER_IN_MAINT(database->server))
-		return;
-
-        /** Store previous status */
-        database->mon_prev_status = database->server->status;
-        
-	if (database->con == NULL || mysql_ping(database->con) != 0)
+	else
 	{
-		char *dpwd = decryptPassword(passwd);
-                int  connect_timeout = mon->connect_timeout;
-                int  read_timeout = mon->read_timeout;
-                int  write_timeout = mon->write_timeout;
+	    /* The current server is not running
+	     *
+	     * Store server NOT running in server and monitor server pending struct
+	     *
+	     */
+	    if (mysql_errno(database->con) == ER_ACCESS_DENIED_ERROR)
+	    {
+		server_set_status(database->server, SERVER_AUTH_ERROR);
+		monitor_set_pending_status(database, SERVER_AUTH_ERROR);
+	    }
+	    server_clear_status(database->server, SERVER_RUNNING);
+	    monitor_clear_pending_status(database, SERVER_RUNNING);
 
-		if(database->con)
-		    mysql_close(database->con);
-                database->con = mysql_init(NULL);
+	    /* Also clear M/S state in both server and monitor server pending struct */
+	    server_clear_status(database->server, SERVER_SLAVE);
+	    server_clear_status(database->server, SERVER_MASTER);
+	    monitor_clear_pending_status(database, SERVER_SLAVE);
+	    monitor_clear_pending_status(database, SERVER_MASTER);
 
-                mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);
-                mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);
-                mysql_options(database->con, MYSQL_OPT_WRITE_TIMEOUT, (void *)&write_timeout);
-                
-		if (mysql_real_connect(database->con,
-                                       database->server->name,
-                                       uname,
-                                       dpwd,
-                                       NULL,
-                                       database->server->port,
-                                       NULL,
-                                       0) == NULL)
-		{
-                        free(dpwd);
-                        
-			/* The current server is not running
-			 *
-			 * Store server NOT running in server and monitor server pending struct
-			 *
-			 */
-			if (mysql_errno(database->con) == ER_ACCESS_DENIED_ERROR)
-			{
-				server_set_status(database->server, SERVER_AUTH_ERROR);
-				monitor_set_pending_status(database, SERVER_AUTH_ERROR);
-			}
-			server_clear_status(database->server, SERVER_RUNNING);
-			monitor_clear_pending_status(database, SERVER_RUNNING);
+	    /* Clean addition status too */
+	    server_clear_status(database->server, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+	    server_clear_status(database->server, SERVER_STALE_STATUS);
+	    monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+	    monitor_clear_pending_status(database, SERVER_STALE_STATUS);
 
-			/* Also clear M/S state in both server and monitor server pending struct */
-			server_clear_status(database->server, SERVER_SLAVE);
-			server_clear_status(database->server, SERVER_MASTER);
-			monitor_clear_pending_status(database, SERVER_SLAVE);
-			monitor_clear_pending_status(database, SERVER_MASTER);
+	    /* Log connect failure only once */
+	    if (mon_status_changed(database) && mon_print_fail_status(database))
+	    {
+		LOGIF(LE, (skygw_log_write_flush(
+			LOGFILE_ERROR,
+						 "Error : Monitor was unable to connect to "
+			"server %s:%d : \"%s\"",
+						 database->server->name,
+						 database->server->port,
+						 mysql_error(database->con))));
+	    }
 
-			/* Clean addition status too */
-			server_clear_status(database->server, SERVER_SLAVE_OF_EXTERNAL_MASTER);
-			server_clear_status(database->server, SERVER_STALE_STATUS);
-			monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
-			monitor_clear_pending_status(database, SERVER_STALE_STATUS);
-
-			/* Log connect failure only once */
-			if (mon_status_changed(database) && mon_print_fail_status(database))
-			{
-                                LOGIF(LE, (skygw_log_write_flush(
-                                        LOGFILE_ERROR,
-                                        "Error : Monitor was unable to connect to "
-                                        "server %s:%d : \"%s\"",
-                                        database->server->name,
-                                        database->server->port,
-                                        mysql_error(database->con))));
-			}
-
-			return;
-		}
-		else
-		{
-			server_clear_status(database->server, SERVER_AUTH_ERROR);
-			monitor_clear_pending_status(database, SERVER_AUTH_ERROR);
-		}
-		free(dpwd);
+	    return;
 	}
-        /* Store current status in both server and monitor server pending struct */
-	server_set_status(database->server, SERVER_RUNNING);
-	monitor_set_pending_status(database, SERVER_RUNNING);
+    }
+    /* Store current status in both server and monitor server pending struct */
+    server_set_status(database->server, SERVER_RUNNING);
+    monitor_set_pending_status(database, SERVER_RUNNING);
 
-	/* get server version from current server */
-	server_version = mysql_get_server_version(database->con);
+    /* get server version from current server */
+    server_version = mysql_get_server_version(database->con);
 
-	/* get server version string */
-	server_string = (char *)mysql_get_server_info(database->con);
-	if (server_string) {
-		database->server->server_string = realloc(database->server->server_string, strlen(server_string)+1);
-		if (database->server->server_string)
-			strcpy(database->server->server_string, server_string);
-	}
+    /* get server version string */
+    server_string = (char *)mysql_get_server_info(database->con);
+    if (server_string) {
+	database->server->server_string = realloc(database->server->server_string, strlen(server_string)+1);
+	if (database->server->server_string)
+	    strcpy(database->server->server_string, server_string);
+    }
+    
+    /* get server_id form current node */
+    if (mysql_query(database->con, "SELECT @@server_id") == 0
+	&& (result = mysql_store_result(database->con)) != NULL)
+    {
+	long server_id = -1;
 
-        /* get server_id form current node */
-        if (mysql_query(database->con, "SELECT @@server_id") == 0
-                && (result = mysql_store_result(database->con)) != NULL)
-        {
-                long server_id = -1;
-		if(mysql_field_count(database->con) != 1)
-		{
-		    mysql_free_result(result);
-		    skygw_log_write(LE,"Error: Unexpected result for \"SELECT @@server_id\". Expected 1 columns."
-				    " MySQL Version: %s",version_str);
-		    return;
-		}
-                while ((row = mysql_fetch_row(result)))
-                {
-                        server_id = strtol(row[0], NULL, 10);
-                        if ((errno == ERANGE && (server_id == LONG_MAX
-                                || server_id == LONG_MIN)) || (errno != 0 && server_id == 0))
-                        {
-                                server_id = -1;
-                        }
-                        database->server->node_id = server_id;
-                }
-                mysql_free_result(result);
-        }
-
-	/* Check if the Slave_SQL_Running and Slave_IO_Running status is
-	 * set to Yes
-	 */
-
-	/* Check first for MariaDB 10.x.x and get status for multimaster replication */
-	if (server_version >= 100000) {
-
-		if (mysql_query(database->con, "SHOW ALL SLAVES STATUS") == 0
-			&& (result = mysql_store_result(database->con)) != NULL)
-		{
-			int i = 0;
-			long master_id = -1;
-
-			if(mysql_field_count(database->con) < 42)
-			{
-			    mysql_free_result(result);
-			    skygw_log_write(LE,"Error: \"SHOW ALL SLAVES STATUS\" "
-				    "returned less than the expected amount of columns. Expected 42 columns."
-				    " MySQL Version: %s",version_str);
-			    return;
-			}
-
-			while ((row = mysql_fetch_row(result)))
-			{
-				/* get Slave_IO_Running and Slave_SQL_Running values*/
-				if (strncmp(row[12], "Yes", 3) == 0
-						&& strncmp(row[13], "Yes", 3) == 0) {
-					isslave += 1;
-				}
-
-				/* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building 
-				 * the replication tree, slaves ids will be added to master(s) and we will have at least the 
-				 * root master server.
-				 * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
-				 */
-				if (strncmp(row[12], "Yes", 3) == 0) {
-					/* get Master_Server_Id values */
-                                        master_id = atol(row[41]);
-                                        if (master_id == 0)
-                                                master_id = -1;
-				}
-
-				i++;
-			}
-			/* store master_id of current node */
-			memcpy(&database->server->master_id, &master_id, sizeof(long));
-
-			mysql_free_result(result);
-
-			/* If all configured slaves are running set this node as slave */
-			if (isslave > 0 && isslave == i)
-				isslave = 1;
-			else
-				isslave = 0;
-		}
-	} else {	
-		if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0
-			&& (result = mysql_store_result(database->con)) != NULL)
-		{
-			long master_id = -1;
-			if(mysql_field_count(database->con) < 40)
-			{
-			    mysql_free_result(result);
-			    if(server_version < 5*10000 + 5*100)
-			    {
-				if(database->log_version_err)
-				{
-				    skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
-					    " for versions less than 5.5 does not have master_server_id, "
-					    "replication tree cannot be resolved for server %s."
-					    " MySQL Version: %s",database->server->unique_name,version_str);
-				    database->log_version_err = false;
-				}
-			    }
-			    else
-			    {
-				skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
-					"returned less than the expected amount of columns. Expected 40 columns."
-					" MySQL Version: %s",version_str);
-			    }
-			    return;
-			}
-
-			while ((row = mysql_fetch_row(result)))
-			{
-				/* get Slave_IO_Running and Slave_SQL_Running values*/
-				if (strncmp(row[10], "Yes", 3) == 0
-						&& strncmp(row[11], "Yes", 3) == 0) {
-					isslave = 1;
-				}
-
-				/* If Slave_IO_Running = Yes, assign the master_id to current server: this allows building 
-				 * the replication tree, slaves ids will be added to master(s) and we will have at least the 
-				 * root master server.
-				 * Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
-				 */
-				if (strncmp(row[10], "Yes", 3) == 0) {
-					/* get Master_Server_Id values */
-					master_id = atol(row[39]);
-					if (master_id == 0)
-						master_id = -1;
-				}
-			}
-			/* store master_id of current node */
-			memcpy(&database->server->master_id, &master_id, sizeof(long));
-
-			mysql_free_result(result);
-		}
-	}
-
-	/* Remove addition info */
-	monitor_clear_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
-	monitor_clear_pending_status(database, SERVER_STALE_STATUS);
-
-	/* Please note, the MASTER status and SERVER_SLAVE_OF_EXTERNAL_MASTER
-	 * will be assigned in the monitorMain() via get_replication_tree() routine
-	 */
-
-	/* Set the Slave Role */
-	if (isslave)
+	if(mysql_field_count(database->con) != 1)
 	{
-		monitor_set_pending_status(database, SERVER_SLAVE);
-		/* Avoid any possible stale Master state */
-		monitor_clear_pending_status(database, SERVER_MASTER);
-	} else {
-		/* Avoid any possible Master/Slave stale state */
-		monitor_clear_pending_status(database, SERVER_SLAVE);
-		monitor_clear_pending_status(database, SERVER_MASTER);
+	    mysql_free_result(result);
+	    skygw_log_write(LE,"Error: Unexpected result for 'SELECT @@server_id'. Expected 1 column."
+		    " MySQL Version: %s",version_str);
+	    return;
 	}
+
+	while ((row = mysql_fetch_row(result)))
+	{
+	    server_id = strtol(row[0], NULL, 10);
+	    if ((errno == ERANGE && (server_id == LONG_MAX
+				     || server_id == LONG_MIN)) || (errno != 0 && server_id == 0))
+	    {
+		server_id = -1;
+	    }
+	    database->server->node_id = server_id;
+	}
+	mysql_free_result(result);
+    }
+
+    /* Check first for MariaDB 10.x.x and get status for multi-master replication */
+    if (server_version >= 100000)
+    {
+	monitor_mysql100_db(database);
+    }
+    else if(server_version >= 5*10000 + 5*100)
+    {
+	monitor_mysql55_db(database);
+    }
+    else
+    {
+	monitor_mysql51_db(database);
+    }
+
 }
 
 /**
@@ -723,7 +866,11 @@ detect_stale_master = handle->detectStaleMaster;
 			}
 		} else {
 			/* Compute the replication tree */
+		    if(handle->mysql51_replication)
+			root_master = build_mysql51_replication_tree(mon);
+		    else
 			root_master = get_replication_tree(mon, num_servers);
+
 		}
 
 		/* Update server status from monitor pending status on that server*/
@@ -1302,4 +1449,4 @@ bool isMySQLEvent(monitor_event_t event)
 	    return true;
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 0510a13cf..227b693c9 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -67,6 +67,7 @@ typedef struct {
 	int	disableMasterFailback;	/**< Monitor flag for Galera Cluster Master failback */
 	int	availableWhenDonor;	/**< Monitor flag for Galera Cluster Donor availability */
         int     disableMasterRoleSetting; /**< Monitor flag to disable setting master role */
+        bool    mysql51_replication;    /**< Use MySQL 5.1 replication */
 	MONITOR_SERVERS *master;	/**< Master server for MySQL Master/Slave replication */
         char* script; /*< Script to call when state changes occur on servers */
         bool events[MAX_MONITOR_EVENT]; /*< enabled events */

From c7d49a5367a6c768f98270195cb7790eb4e8a9d2 Mon Sep 17 00:00:00 2001
From: Will Fong <will@digitaldev.com>
Date: Wed, 1 Jul 2015 16:34:57 +0800
Subject: [PATCH 17/35] Updated URL for the SchemaRouter

---
 Documentation/Documentation-Contents.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Documentation-Contents.md b/Documentation/Documentation-Contents.md
index dfbef26dc..6753dc929 100644
--- a/Documentation/Documentation-Contents.md
+++ b/Documentation/Documentation-Contents.md
@@ -64,7 +64,7 @@ Here are detailed documents about the filters MaxScale offers. They contain conf
 
 ## Routers
 
- - [Simple Schema Sharding Router](routers/schemarouter/SchemaRouter.md)
+ - [Simple Schema Sharding Router](routers/SchemaRouter.md)
 
 ## Design Documents
 

From cee76f78c28fc1b6da3d8d99d5c362bd53bb6457 Mon Sep 17 00:00:00 2001
From: Will Fong <will@digitaldev.com>
Date: Wed, 1 Jul 2015 16:39:57 +0800
Subject: [PATCH 18/35] Missing opening bracket

---
 Documentation/routers/SchemaRouter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/routers/SchemaRouter.md b/Documentation/routers/SchemaRouter.md
index d1de66b2b..6fbf4b19a 100644
--- a/Documentation/routers/SchemaRouter.md
+++ b/Documentation/routers/SchemaRouter.md
@@ -15,7 +15,7 @@ In almost all the cases these can be avoided by proper server configuration and
 Here is an example configuration of the schemarouter router:
 
 ```
-Shard Router]
+[Shard Router]
 type=service
 router=schemarouter
 servers=server1,server2

From 88e9fa2d4d5147fedf305ba30f89cedffcdfed0c Mon Sep 17 00:00:00 2001
From: Will Fong <will@digitaldev.com>
Date: Wed, 1 Jul 2015 16:44:21 +0800
Subject: [PATCH 19/35] Went back one too many levels

---
 Documentation/routers/SchemaRouter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/routers/SchemaRouter.md b/Documentation/routers/SchemaRouter.md
index 6fbf4b19a..1d8188889 100644
--- a/Documentation/routers/SchemaRouter.md
+++ b/Documentation/routers/SchemaRouter.md
@@ -64,4 +64,4 @@ The schemarouter router currently has some limitations due to the nature of the
 
 ## Examples
 
-[Here](../../Tutorials/Simple-Sharding-Tutorial.md) is a small tutorial on how to set up a sharded database.
+[Here](../Tutorials/Simple-Sharding-Tutorial.md) is a small tutorial on how to set up a sharded database.

From 2b0f0b89abb6327f64050e8c59541f8bc5ba1858 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 1 Jul 2015 16:07:27 +0300
Subject: [PATCH 20/35] Added master server id to mysql 5.1 monitoring.

---
 server/modules/monitor/mysql_mon.c | 39 ++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 2fd66766e..07418253d 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -319,7 +319,7 @@ static inline bool connect_to_db(MONITOR* mon,MONITOR_SERVERS *database)
 			       0) != NULL);
 }
 
-inline void monitor_mysql100_db(MONITOR_SERVERS* database)
+static inline void monitor_mysql100_db(MONITOR_SERVERS* database)
 {
     bool isslave = false;
     MYSQL_RES* result;
@@ -395,7 +395,7 @@ inline void monitor_mysql100_db(MONITOR_SERVERS* database)
     }
 }
 
-inline void monitor_mysql55_db(MONITOR_SERVERS* database)
+static inline void monitor_mysql55_db(MONITOR_SERVERS* database)
 {
     bool isslave = false;
     MYSQL_RES* result;
@@ -461,7 +461,7 @@ inline void monitor_mysql55_db(MONITOR_SERVERS* database)
     }
 }
 
-inline void monitor_mysql51_db(MONITOR_SERVERS* database)
+static inline void monitor_mysql51_db(MONITOR_SERVERS* database)
 {
     bool isslave = false;
     MYSQL_RES* result;
@@ -515,13 +515,13 @@ inline void monitor_mysql51_db(MONITOR_SERVERS* database)
 static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 {
     MONITOR_SERVERS* database = mon->databases;
+    MONITOR_SERVERS* ptr;
 
     while(database)
     {
 	bool ismaster = false;
 	MYSQL_RES* result;
 	MYSQL_ROW row;
-	unsigned long *slaves;
 	int nslaves = 0;
 	if(database->con)
 	{
@@ -540,12 +540,13 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 		if(mysql_num_rows(result) > 0)
 		{
 		    ismaster = true;
-		    while ((row = mysql_fetch_row(result)))
+		    while (nslaves < MONITOR_MAX_NUM_SLAVES && (row = mysql_fetch_row(result)))
 		    {
 			/* get Slave_IO_Running and Slave_SQL_Running values*/
 			database->server->slaves[nslaves] = atol(row[0]);
 			nslaves++;
 		    }
+		    database->server->slaves[nslaves] = 0;
 		}
 
 		mysql_free_result(result);
@@ -560,6 +561,32 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 	}
 	database = database->next;
     }
+
+    database = mon->databases;
+
+    /**  */
+    while(database)
+    {
+	ptr = mon->databases;
+
+	while(ptr)
+	{
+	    for(int i = 0;ptr->server->slaves[i];i++)
+	    {
+		if(ptr->server->slaves[i] == database->server->node_id)
+		{
+		    database->server->master_id = ptr->server->node_id;
+		    break;
+		}
+	    }
+	    ptr = ptr->next;
+	}
+	if(database->server->master_id <= 0)
+	{
+	    monitor_set_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
+	}
+	database = database->next;
+    }
 }
 /**
  * Monitor an individual server
@@ -575,14 +602,12 @@ monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
     MYSQL_RES	  *result;
     int               isslave = 0;
     char		  *uname  = mon->user;
-    char              *passwd = mon->password;
     unsigned long int server_version = 0;
     char 		  *server_string;
 
     if (database->server->monuser != NULL)
     {
 	uname = database->server->monuser;
-	passwd = database->server->monpw;
     }
 
     if (uname == NULL)

From 0621e33cb0ac00364d56cbea80e1ef3d24af748e Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 1 Jul 2015 19:38:45 +0300
Subject: [PATCH 21/35] Updated documentation and set C99 mode as the default.

---
 Documentation/monitors/MySQL-Monitor.md | 8 ++++++++
 cmake/macros.cmake                      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Documentation/monitors/MySQL-Monitor.md b/Documentation/monitors/MySQL-Monitor.md
index 7228c1b10..6c7e70500 100644
--- a/Documentation/monitors/MySQL-Monitor.md
+++ b/Documentation/monitors/MySQL-Monitor.md
@@ -98,6 +98,14 @@ A list of event names which cause the script to be executed. If this option is n
 events=master_down,slave_down
 ```
 
+### `mysql51_only`
+
+Enable support for MySQL 5.1 replication monitoring. This is needed if a MySQL server older than 5.5 is used as a slave in replication.
+
+```
+mysql51_only=true
+```
+
 ## Script events
 
 Here is a table of all possible event types and their descriptions.
diff --git a/cmake/macros.cmake b/cmake/macros.cmake
index d7921f1c4..3c9d16cc0 100644
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -21,7 +21,7 @@ endmacro()
 macro(set_variables)
 
   # Use C99
-  set(USE_C99 FALSE CACHE BOOL "Use C99 standard")
+  set(USE_C99 TRUE CACHE BOOL "Use C99 standard")
 
   # hostname or IP address of MaxScale's host
   set(TEST_HOST "127.0.0.1" CACHE STRING "hostname or IP address of MaxScale's host")

From c8173ec4f7a272e5e4a5bc0288b9767f56bd084f Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 2 Jul 2015 10:00:38 +0300
Subject: [PATCH 22/35] Added missing return value.

---
 server/modules/monitor/mysql_mon.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 07418253d..b5bbed4dd 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -512,10 +512,18 @@ static inline void monitor_mysql51_db(MONITOR_SERVERS* database)
     }
 }
 
+/**
+ * Build the replication tree for a MySQL 5.1 cluster
+ *
+ * This function queries each server with SHOW SLAVE HOSTS to determine which servers
+ * have slaves replicating from them.
+ * @param mon Monitor
+ * @return Lowest server ID master in the monitor
+ */
 static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 {
     MONITOR_SERVERS* database = mon->databases;
-    MONITOR_SERVERS* ptr;
+    MONITOR_SERVERS *ptr,*rval = NULL;
 
     while(database)
     {
@@ -534,7 +542,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 		    skygw_log_write(LE,"Error: \"SHOW SLAVE HOSTS\" "
 			    "returned less than the expected amount of columns. Expected 4 columns."
 			    " MySQL Version: %s",version_str);
-		    return;
+		    return NULL;
 		}
 
 		if(mysql_num_rows(result) > 0)
@@ -557,6 +565,8 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 	    if (ismaster)
 	    {
 		monitor_set_pending_status(database, SERVER_MASTER);
+		if(rval == NULL || rval->server->node_id > database->server->node_id)
+		    rval = database;
 	    }
 	}
 	database = database->next;
@@ -587,6 +597,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 	}
 	database = database->next;
     }
+    return rval;
 }
 /**
  * Monitor an individual server

From 1eb907ad38ef0e41265f90c61498df3e996f05f7 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Fri, 3 Jul 2015 17:08:32 +0300
Subject: [PATCH 23/35] Fixed common sharding functions referring to
 schemarouter.

---
 server/modules/routing/schemarouter/sharding_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/modules/routing/schemarouter/sharding_common.c b/server/modules/routing/schemarouter/sharding_common.c
index d69b12d02..cf6bf2c12 100644
--- a/server/modules/routing/schemarouter/sharding_common.c
+++ b/server/modules/routing/schemarouter/sharding_common.c
@@ -46,7 +46,7 @@ bool extract_database(GWBUF* buf, char* str)
 	tok = strtok_r(query," ;",&saved);
 	if(tok == NULL || strcasecmp(tok,"use") != 0)
 	{
-	    skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
+	    skygw_log_write(LOGFILE_ERROR,"extract_database: Malformed chage database packet.");
 	    succp = false;
 	    goto retblock;
 	}
@@ -54,7 +54,7 @@ bool extract_database(GWBUF* buf, char* str)
 	tok = strtok_r(NULL," ;",&saved);
 	if(tok == NULL)
 	{
-	    skygw_log_write(LOGFILE_ERROR,"Schemarouter: Malformed chage database packet.");
+	    skygw_log_write(LOGFILE_ERROR,"extract_database: Malformed chage database packet.");
 	    succp = false;
 	    goto retblock;
 	}

From 7e704d2312bda792183e3a124eb3e78fb9a0a4bd Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Sat, 4 Jul 2015 07:13:14 +0300
Subject: [PATCH 24/35] Fixed module load failure referring to
 lib/maxscale/modules instead of lib/maxscale.

---
 server/core/service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/service.c b/server/core/service.c
index 3dee01c91..4e36708f8 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -125,7 +125,7 @@ SERVICE 	*service;
                         "Error : Unable to load %s module \"%s\".\n\t\t\t"
                         "      Ensure that lib%s.so exists in one of the "
                         "following directories :\n\t\t\t      "
-                        "- %s/modules\n%s%s",
+                        "- %s\n%s%s",
                         MODULE_ROUTER,
                         router,
                         router,

From 4f421cb69a89ba2f9e3f9bdd65897f8b7ec08abd Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Sat, 4 Jul 2015 07:30:23 +0300
Subject: [PATCH 25/35] Added missing --piddir option to testall maxscale
 invokation.

---
 cmake/testall.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/testall.cmake b/cmake/testall.cmake
index 65c27fa5a..839029312 100644
--- a/cmake/testall.cmake
+++ b/cmake/testall.cmake
@@ -1,4 +1,4 @@
-execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -f ${CMAKE_BINARY_DIR}/maxscale.cnf --logdir=${CMAKE_BINARY_DIR}/ --datadir=${CMAKE_BINARY_DIR}/ --cachedir=${CMAKE_BINARY_DIR}/ &> ${CMAKE_BINARY_DIR}/maxscale.output"
+execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -f ${CMAKE_BINARY_DIR}/maxscale.cnf --logdir=${CMAKE_BINARY_DIR}/ --datadir=${CMAKE_BINARY_DIR}/ --cachedir=${CMAKE_BINARY_DIR}/ --piddir=${CMAKE_BINARY_DIR}/ &> ${CMAKE_BINARY_DIR}/maxscale.output"
 OUTPUT_VARIABLE MAXSCALE_OUT)
 execute_process(COMMAND make test RESULT_VARIABLE RVAL)
 execute_process(COMMAND killall maxscale)

From 03b5a634f44f78d494ec7e4ee1ffb3c5fdaf3359 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Sat, 4 Jul 2015 09:04:53 +0300
Subject: [PATCH 26/35] Fix to MXS-244:
 https://mariadb.atlassian.net/browse/MXS-244 Fixed buffers being only
 partially consumed if they contained more than one packet when a replu to a
 prepared statement is received.

---
 server/modules/routing/readwritesplit/readwritesplit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index b801d9aec..3c329f646 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -3787,7 +3787,7 @@ static GWBUF* sescmd_cursor_process_replies(
 				 dcb_close(bref->bref_dcb);
 			     *reconnect = true;
 			     if(replybuf)
-				 gwbuf_consume(replybuf,gwbuf_length(replybuf));
+				 while((replybuf = gwbuf_consume(replybuf,gwbuf_length(replybuf))));
 			}
                 }
                 /** This is a response from the master and it is the "right" one.
@@ -3830,7 +3830,7 @@ static GWBUF* sescmd_cursor_process_replies(
 		    skygw_log_write(LOGFILE_DEBUG,"Slave '%s' responded faster to a session command.",
 			     bref->bref_backend->backend_server->unique_name);
 		    if(replybuf)
-			gwbuf_free(replybuf);
+			while((replybuf = gwbuf_consume(replybuf,gwbuf_length(replybuf))));
 		    return NULL;
 		}
 	    

From 058f49eb88aa25031ff6b76f898f8865fa5f8e41 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 20:14:57 +0300
Subject: [PATCH 27/35] Added error message about MySQL versions lower than 5.5
 and monitors without the 'mysql51_replication' enabled.

---
 Documentation/monitors/MySQL-Monitor.md |  4 ++--
 server/core/config.c                    |  1 +
 server/modules/monitor/mysql_mon.c      | 26 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Documentation/monitors/MySQL-Monitor.md b/Documentation/monitors/MySQL-Monitor.md
index 6c7e70500..e53b7c336 100644
--- a/Documentation/monitors/MySQL-Monitor.md
+++ b/Documentation/monitors/MySQL-Monitor.md
@@ -98,12 +98,12 @@ A list of event names which cause the script to be executed. If this option is n
 events=master_down,slave_down
 ```
 
-### `mysql51_only`
+### `mysql51_replication`
 
 Enable support for MySQL 5.1 replication monitoring. This is needed if a MySQL server older than 5.5 is used as a slave in replication.
 
 ```
-mysql51_only=true
+mysql51_replication=true
 ```
 
 ## Script events
diff --git a/server/core/config.c b/server/core/config.c
index 58dd42b7a..e6034445d 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -2039,6 +2039,7 @@ static char *monitor_params[] =
                 "passwd",
 		"script",
 		"events",
+		"mysql51_replication",
 		"monitor_interval",
 		"detect_replication_lag",
 		"detect_stale_master",
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index b5bbed4dd..8cc78340f 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -81,6 +81,7 @@ static void set_master_heartbeat(MYSQL_MONITOR *, MONITOR_SERVERS *);
 static void set_slave_heartbeat(MONITOR *, MONITOR_SERVERS *);
 static int add_slave_to_master(long *, int, long);
 bool isMySQLEvent(monitor_event_t event);
+static bool report_version_err = true;
 static MONITOR_OBJECT MyObject = { 
 	startMonitor, 
 	stopMonitor, 
@@ -200,7 +201,7 @@ startMonitor(void *arg, void* opt)
 	    else
 		have_events = true;
 	}
-	else if(!strcmp(params->name,"mysql51_only"))
+	else if(!strcmp(params->name,"mysql51_replication"))
 	{
 	    handle->mysql51_replication = config_truth_value(params->value);
 	}
@@ -539,7 +540,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 		if(mysql_field_count(database->con) < 4)
 		{
 		    mysql_free_result(result);
-		    skygw_log_write(LE,"Error: \"SHOW SLAVE HOSTS\" "
+		    skygw_log_write_flush(LE,"Error: \"SHOW SLAVE HOSTS\" "
 			    "returned less than the expected amount of columns. Expected 4 columns."
 			    " MySQL Version: %s",version_str);
 		    return NULL;
@@ -553,6 +554,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 			/* get Slave_IO_Running and Slave_SQL_Running values*/
 			database->server->slaves[nslaves] = atol(row[0]);
 			nslaves++;
+			LOGIF(LD,(skygw_log_write_flush(LD,"Found slave at %s:%d",row[1],row[2])));
 		    }
 		    database->server->slaves[nslaves] = 0;
 		}
@@ -564,6 +566,10 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 	    /* Set the Slave Role */
 	    if (ismaster)
 	    {
+		LOGIF(LD,(skygw_log_write(LD,"Master server found at %s:%d with %d slaves",
+					 database->server->name,
+					 database->server->port,
+					 nslaves)));
 		monitor_set_pending_status(database, SERVER_MASTER);
 		if(rval == NULL || rval->server->node_id > database->server->node_id)
 		    rval = database;
@@ -574,7 +580,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 
     database = mon->databases;
 
-    /**  */
+    /** Set master server IDs */
     while(database)
     {
 	ptr = mon->databases;
@@ -591,7 +597,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 	    }
 	    ptr = ptr->next;
 	}
-	if(database->server->master_id <= 0)
+	if(database->server->master_id <= 0 && SERVER_IS_SLAVE(database->server))
 	{
 	    monitor_set_pending_status(database, SERVER_SLAVE_OF_EXTERNAL_MASTER);
 	}
@@ -733,7 +739,17 @@ monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
     }
     else
     {
-	monitor_mysql51_db(database);
+	if(handle->mysql51_replication)
+	{
+	    monitor_mysql51_db(database);
+	}
+	else if(report_version_err)
+	{
+	    report_version_err = false;
+	    skygw_log_write(LE,"Error: MySQL version is lower than 5.5 and 'mysql51_replication' option is not enabled,"
+		    " replication tree cannot be resolved. To enable MySQL 5.1 replication detection, "
+		    "add 'mysql51_replication=true' to the monitor section.");
+	}
     }
 
 }

From 0d516789bf66b0850bfb44ef7e1c9df9e984ec9c Mon Sep 17 00:00:00 2001
From: Will Fong <will@digitaldev.com>
Date: Wed, 8 Jul 2015 14:54:55 +0800
Subject: [PATCH 28/35] Direct link to MXS Issues page

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 263134569..d2ac42128 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ issues and communicate with the MaxScale community.
 	or use the [forum](http://groups.google.com/forum/#!forum/maxscale) interface
 	
 Bugs can be reported in the MariaDB Corporation bugs database
-	[https://mariadb.atlassian.net](https://mariadb.atlassian.net) under project MXS.
+	[https://mariadb.atlassian.net/projects/MXS/issues](https://mariadb.atlassian.net/projects/MXS/issues)
 
 # Documentation
 

From b592e226e2c56b4b80215cdc37459e5e79beeb21 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 14 Jul 2015 12:05:56 +0300
Subject: [PATCH 29/35] converted inline functions to normal functions.

---
 server/modules/routing/binlog/blr_master.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index 86bee0b6b..89b6f8c75 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -77,7 +77,7 @@ static int  blr_rotate_event(ROUTER_INSTANCE *router, uint8_t *pkt, REP_HEADER *
 void blr_distribute_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr);
 static void *CreateMySQLAuthData(char *username, char *password, char *database);
 void blr_extract_header(uint8_t *pkt, REP_HEADER *hdr);
-inline uint32_t extract_field(uint8_t *src, int bits);
+static uint32_t extract_field(uint8_t *src, int bits);
 static void blr_log_packet(logfile_id_t file, char *msg, uint8_t *ptr, int len);
 static void blr_master_close(ROUTER_INSTANCE *);
 static char *blr_extract_column(GWBUF *buf, int col);
@@ -1166,7 +1166,7 @@ blr_extract_header(register uint8_t *ptr, register REP_HEADER *hdr)
  * @param src	The raw packet source
  * @param bits	The number of bits to extract (multiple of 8)
  */
-inline uint32_t
+static uint32_t
 extract_field(register uint8_t *src, int bits)
 {
 register uint32_t	rval = 0, shift = 0;

From 40f4d8ee8f88f3bca6fa2b7f6c9da0644f52ba87 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 14 Jul 2015 12:10:41 +0300
Subject: [PATCH 30/35] Revert "converted inline functions to normal
 functions."

This reverts commit b592e226e2c56b4b80215cdc37459e5e79beeb21.
---
 server/modules/routing/binlog/blr_master.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index 89b6f8c75..86bee0b6b 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -77,7 +77,7 @@ static int  blr_rotate_event(ROUTER_INSTANCE *router, uint8_t *pkt, REP_HEADER *
 void blr_distribute_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr);
 static void *CreateMySQLAuthData(char *username, char *password, char *database);
 void blr_extract_header(uint8_t *pkt, REP_HEADER *hdr);
-static uint32_t extract_field(uint8_t *src, int bits);
+inline uint32_t extract_field(uint8_t *src, int bits);
 static void blr_log_packet(logfile_id_t file, char *msg, uint8_t *ptr, int len);
 static void blr_master_close(ROUTER_INSTANCE *);
 static char *blr_extract_column(GWBUF *buf, int col);
@@ -1166,7 +1166,7 @@ blr_extract_header(register uint8_t *ptr, register REP_HEADER *hdr)
  * @param src	The raw packet source
  * @param bits	The number of bits to extract (multiple of 8)
  */
-static uint32_t
+inline uint32_t
 extract_field(register uint8_t *src, int bits)
 {
 register uint32_t	rval = 0, shift = 0;

From 96edaca90c0d5c36999599929962b1aec2ac5bb5 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 14 Jul 2015 12:14:01 +0300
Subject: [PATCH 31/35] Disabled C99.

---
 cmake/macros.cmake                 | 2 +-
 server/modules/monitor/mysql_mon.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/macros.cmake b/cmake/macros.cmake
index 848b3290f..49f4096dc 100644
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -21,7 +21,7 @@ endmacro()
 macro(set_variables)
 
   # Use C99
-  set(USE_C99 TRUE CACHE BOOL "Use C99 standard")
+  set(USE_C99 FALSE CACHE BOOL "Use C99 standard")
 
   # Install the template maxscale.cnf file
   set(WITH_MAXSCALE_CNF TRUE CACHE BOOL "Install the template maxscale.cnf file")
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 8cc78340f..a37526bb5 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -525,7 +525,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 {
     MONITOR_SERVERS* database = mon->databases;
     MONITOR_SERVERS *ptr,*rval = NULL;
-
+    int i;
     while(database)
     {
 	bool ismaster = false;
@@ -587,7 +587,7 @@ static MONITOR_SERVERS *build_mysql51_replication_tree(MONITOR *mon)
 
 	while(ptr)
 	{
-	    for(int i = 0;ptr->server->slaves[i];i++)
+	    for(i = 0;ptr->server->slaves[i];i++)
 	    {
 		if(ptr->server->slaves[i] == database->server->node_id)
 		{

From 124ad82de491adf1f6d5d675d737f83d2b64be6c Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 15 Jul 2015 11:02:59 +0300
Subject: [PATCH 32/35] Small fix to readwritesplit session command handling.

---
 server/modules/routing/readwritesplit/readwritesplit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index b35a674c4..d6dba8e01 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -4049,12 +4049,11 @@ static bool execute_sescmd_in_backend(
                 sescmd_cursor_set_active(scur, true);
         }
 
-	buf = sescmd_cursor_clone_querybuf(scur);
-
         switch (scur->scmd_cur_cmd->my_sescmd_packet_type) {
                 case MYSQL_COM_CHANGE_USER:
 			/** This makes it possible to handle replies correctly */
 			gwbuf_set_type(scur->scmd_cur_cmd->my_sescmd_buf, GWBUF_TYPE_SESCMD);
+			buf = sescmd_cursor_clone_querybuf(scur);
 			rc = dcb->func.auth(
                                 dcb, 
                                 NULL, 
@@ -4087,6 +4086,7 @@ static bool execute_sescmd_in_backend(
                          */
 
                         gwbuf_set_type(scur->scmd_cur_cmd->my_sescmd_buf, GWBUF_TYPE_SESCMD);
+			buf = sescmd_cursor_clone_querybuf(scur);
                         rc = dcb->func.write(
                                 dcb, 
                                 buf);

From 028159dffc5ff651330d6f2bbd9325b3f882a922 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 15 Jul 2015 17:17:47 +0300
Subject: [PATCH 33/35] Fixed broken link.

---
 Documentation/About/About-MaxScale.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/About/About-MaxScale.md b/Documentation/About/About-MaxScale.md
index 4477c2907..ef0723914 100644
--- a/Documentation/About/About-MaxScale.md
+++ b/Documentation/About/About-MaxScale.md
@@ -17,7 +17,7 @@ Bugs can be reported in the MariaDB Jira
 	[https://mariadb.atlassian.net](https://mariadb.atlassian.net)
 
 ## Installing MaxScale
-Information about installing MaxScale, either from a repository or by building from source code, is included in the guide [Getting Started with MaxScale](/Documentation/Getting-Started/Getting-Started-With-MaxScale.md).
+Information about installing MaxScale, either from a repository or by building from source code, is included in the [MariaDB MaxScale Installation Guide](../Getting-Started/MariaDB-MaxScale-Installation-Guide.md).
 
 The same guide also provides basic information on running MaxScale. More detailed information about configuring MaxScale is given in the [Configuration Guide](/Documentation/Getting-Started/Configuration-Guide.md).
 

From 0e5ee7c861126be2c97bc13c752ea84c95da4e37 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 16 Jul 2015 05:39:19 +0300
Subject: [PATCH 34/35] Fixed log manager.

---
 log_manager/log_manager.cc | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 33c1913bb..88a30e294 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -311,11 +311,7 @@ const char* get_suffix_default(void)
 
 const char* get_debug_prefix_default(void)
 {
-#ifdef OLD_LOGNAMES
-    return "skygw_debug";
-#else
     return "debug";
-#endif
 }
 
 const char* get_debug_suffix_default(void)
@@ -325,11 +321,7 @@ const char* get_debug_suffix_default(void)
 
 const char* get_trace_prefix_default(void)
 {
-#ifdef OLD_LOGNAMES
-    return "skygw_trace";
-#else
     return "trace";
-#endif
 }
 
 const char* get_trace_suffix_default(void)
@@ -339,11 +331,7 @@ const char* get_trace_suffix_default(void)
 
 const char* get_msg_prefix_default(void)
 {
-#ifdef OLD_LOGNAMES
-    return "skygw_msg";
-#else
     return "messages";
-#endif
 }
 
 const char* get_msg_suffix_default(void)
@@ -353,11 +341,7 @@ const char* get_msg_suffix_default(void)
 
 const char* get_err_prefix_default(void)
 {
-#ifdef OLD_LOGNAMES
-    return "skygw_err";
-#else
     return "error";
-#endif
 }
 
 const char* get_err_suffix_default(void)
@@ -367,7 +351,7 @@ const char* get_err_suffix_default(void)
 
 const char* get_logpath_default(void)
 {
-        return "/tmp";
+        return "/var/log/maxscale";
 }
 
 static bool logmanager_init_nomutex(

From c74d43920c3ca9272eda3f4aeab76b567aee8680 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 16 Jul 2015 05:46:22 +0300
Subject: [PATCH 35/35] Fixed type in documentation.

---
 .../Getting-Started/MariaDB-MaxScale-Installation-Guide.md     | 2 +-
 log_manager/log_manager.cc                                     | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md b/Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md
index 31b713121..bf752b1fd 100644
--- a/Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md
+++ b/Documentation/Getting-Started/MariaDB-MaxScale-Installation-Guide.md
@@ -16,7 +16,7 @@ The simplest way to install MaxScale is to use one of the binary packages that a
 
 ![image alt text](images/getting_started.png)
 
-If you want to install only MaxScale, futher down you will find the product specific download pages. Click on the MariaDB MaxScale link and follow the distribution specific instructions.
+If you want to install only MaxScale, further down you will find the product specific download pages. Click on the MariaDB MaxScale link and follow the distribution specific instructions.
 
 ![image alt text](images/getting_started2.png)
 
diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index 88a30e294..203335505 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -80,9 +80,6 @@ ssize_t log_ses_count[LOGFILE_LAST] = {0};
  */
 #define MAX_LOGSTRLEN BUFSIZ
 
-/** Use the skygw_ prefix, only for 1.1 compatible builds*/
-#define OLD_LOGNAMES
-
 /**
  * Path to directory in which all files are stored to shared memory
  * by the OS.