From a2e281823a6f6796b85a458f3a25927745747c4c Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 30 Jun 2015 14:58:36 +0300
Subject: [PATCH 01/17] Added NULL checks to readwritesplit.

---
 .../routing/readwritesplit/readwritesplit.c   | 131 +++++++++++++-----
 1 file changed, 99 insertions(+), 32 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 14f99c361..b5b4ddb36 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -226,7 +226,7 @@ static rses_property_t* mysql_sescmd_get_property(
 static rses_property_t* rses_property_init(
 	rses_property_type_t prop_type);
 
-static void rses_property_add(
+static int rses_property_add(
 	ROUTER_CLIENT_SES* rses,
 	rses_property_t*   prop);
 
@@ -2943,6 +2943,11 @@ static void bref_clear_state(
         backend_ref_t* bref,
         bref_state_t   state)
 {
+    if(bref == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to bref_clear_state. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
         if (state != BREF_WAITING_RESULT)
         {
                 bref->bref_state &= ~state;
@@ -2972,6 +2977,11 @@ static void bref_set_state(
         backend_ref_t* bref,
         bref_state_t   state)
 {
+    if(bref == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to bref_set_state. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
         if (state != BREF_WAITING_RESULT)
         {
                 bref->bref_state |= state;
@@ -3535,7 +3545,8 @@ static rses_property_t* rses_property_init(
 	prop = (rses_property_t*)calloc(1, sizeof(rses_property_t));
 	if (prop == NULL)
 	{
-		goto return_prop;
+	    skygw_log_write(LE,"Error: Malloc returned NULL. (%s:%d)",__FILE__,__LINE__);
+	    return NULL;
 	}
 	prop->rses_prop_type = prop_type;
 #if defined(SS_DEBUG)
@@ -3554,6 +3565,11 @@ return_prop:
 static void rses_property_done(
 	rses_property_t* prop)
 {
+    if(prop == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to rses_property_done. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
 	CHK_RSES_PROP(prop);
 	
 	switch (prop->rses_prop_type) {
@@ -3587,10 +3603,20 @@ static void rses_property_done(
  * 
  * Router client session must be locked.
  */
-static void rses_property_add(
+static int rses_property_add(
         ROUTER_CLIENT_SES* rses,
         rses_property_t*   prop)
 {
+    if(rses == NULL)
+    {
+	skygw_log_write(LE,"Error: Router client session is NULL. (%s:%d)",__FILE__,__LINE__);
+	return -1;
+    }
+    if(prop == NULL)
+    {
+	skygw_log_write(LE,"Error: Router client session property is NULL. (%s:%d)",__FILE__,__LINE__);
+	return -1;
+    }
         rses_property_t* p;
         
         CHK_CLIENT_RSES(rses);
@@ -3612,6 +3638,7 @@ static void rses_property_add(
                 }
                 p->rses_prop_next = prop;
         }
+	return 0;
 }
 
 /** 
@@ -3622,7 +3649,13 @@ static mysql_sescmd_t* rses_property_get_sescmd(
         rses_property_t* prop)
 {
         mysql_sescmd_t* sescmd;
-        
+
+	if(prop == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to rses_property_get_sescmd. (%s:%d)",__FILE__,__LINE__);
+	    return;
+	}
+
         CHK_RSES_PROP(prop);
         ss_dassert(prop->rses_prop_rsession == NULL ||
                 SPINLOCK_IS_LOCKED(&prop->rses_prop_rsession->rses_lock));
@@ -3635,22 +3668,6 @@ static mysql_sescmd_t* rses_property_get_sescmd(
         }
         return sescmd;
 }
-       
-/**
-static void rses_begin_locked_property_action(
-        rses_property_t* prop)
-{
-        CHK_RSES_PROP(prop);
-        spinlock_acquire(&prop->rses_prop_lock);
-}
-
-static void rses_end_locked_property_action(
-        rses_property_t* prop)
-{
-        CHK_RSES_PROP(prop);
-        spinlock_release(&prop->rses_prop_lock);
-}
-*/
 
 /**
  * Create session command property.
@@ -3683,6 +3700,11 @@ static mysql_sescmd_t* mysql_sescmd_init (
 static void mysql_sescmd_done(
 	mysql_sescmd_t* sescmd)
 {
+    if(sescmd == NULL)
+    {
+	skygw_log_write(LE,"Error: NULL parameter passed to mysql_sescmd_done. (%s:%d)",__FILE__,__LINE__);
+	return;
+    }
 	CHK_RSES_PROP(sescmd->my_sescmd_prop);
 	gwbuf_free(sescmd->my_sescmd_buf);
         memset(sescmd, 0, sizeof(mysql_sescmd_t));
@@ -3855,6 +3877,12 @@ static bool sescmd_cursor_is_active(
 	sescmd_cursor_t* sescmd_cursor)
 {
 	bool succp;
+
+	if(sescmd_cursor == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_is_active. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         ss_dassert(SPINLOCK_IS_LOCKED(&sescmd_cursor->scmd_cur_rses->rses_lock));
 
         succp = sescmd_cursor->scmd_cur_active;
@@ -3880,6 +3908,11 @@ static GWBUF* sescmd_cursor_clone_querybuf(
 	sescmd_cursor_t* scur)
 {
 	GWBUF* buf;
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_clone_querybuf. (%s:%d)",__FILE__,__LINE__);
+	    return NULL;
+	}
 	ss_dassert(scur->scmd_cur_cmd != NULL);
 	
 	buf = gwbuf_clone(scur->scmd_cur_cmd->my_sescmd_buf);
@@ -3892,7 +3925,12 @@ static bool sescmd_cursor_history_empty(
         sescmd_cursor_t* scur)
 {
         bool succp;
-        
+
+        if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_history_empty. (%s:%d)",__FILE__,__LINE__);
+	    return true;
+	}
         CHK_SESCMD_CUR(scur);
         
         if (scur->scmd_cur_rses->rses_properties[RSES_PROP_TYPE_SESCMD] == NULL)
@@ -3912,6 +3950,11 @@ static void sescmd_cursor_reset(
         sescmd_cursor_t* scur)
 {
         ROUTER_CLIENT_SES* rses;
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_reset. (%s:%d)",__FILE__,__LINE__);
+	    return;
+	}
         CHK_SESCMD_CUR(scur);
         CHK_CLIENT_RSES(scur->scmd_cur_rses);
         rses = scur->scmd_cur_rses;
@@ -3928,6 +3971,11 @@ static bool execute_sescmd_history(
 {
         bool             succp;
         sescmd_cursor_t* scur;
+	if(bref == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to execute_sescmd_history. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         CHK_BACKEND_REF(bref);
         
         scur = &bref->bref_sescmd_cur;
@@ -3964,6 +4012,11 @@ static bool execute_sescmd_in_backend(
 	int              rc = 0;
 	sescmd_cursor_t* scur;
 
+	if(backend_ref == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to execute_sescmd_in_backend. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
         if (BREF_IS_CLOSED(backend_ref))
         {
                 succp = false;
@@ -4084,6 +4137,12 @@ static bool sescmd_cursor_next(
 	rses_property_t* prop_curr;
 	rses_property_t* prop_next;
 
+	if(scur == NULL)
+	{
+	    skygw_log_write(LE,"Error: NULL parameter passed to sescmd_cursor_next. (%s:%d)",__FILE__,__LINE__);
+	    return false;
+	}
+
         ss_dassert(scur != NULL);
         ss_dassert(*(scur->scmd_cur_ptr_property) != NULL);
         ss_dassert(SPINLOCK_IS_LOCKED(
@@ -4410,11 +4469,21 @@ static bool route_session_write(
          * prevent it from being released before properties
          * are cleaned up as a part of router sessionclean-up.
          */
-        prop = rses_property_init(RSES_PROP_TYPE_SESCMD);
+        if((prop = rses_property_init(RSES_PROP_TYPE_SESCMD)) == NULL)
+	{
+	    skygw_log_write(LE,"Error: Router session property initialization failed");
+	    rses_end_locked_router_action(router_cli_ses);
+	    return false;
+	}
         mysql_sescmd_init(prop, querybuf, packet_type, router_cli_ses);
         
         /** Add sescmd property to router client session */
-        rses_property_add(router_cli_ses, prop);
+        if(rses_property_add(router_cli_ses, prop) != 0)
+	{
+	    skygw_log_write(LE,"Error: Session property addition failed.");
+	    rses_end_locked_router_action(router_cli_ses);
+	    return false;
+	}
          
         for (i=0; i<router_cli_ses->rses_nbackends; i++)
         {
@@ -4537,7 +4606,10 @@ static void rwsplit_process_router_options(
         int               i;
         char*             value;
         select_criteria_t c;
-        
+
+	if(options == NULL)
+	    return;
+
         for (i = 0; options[i]; i++)
         {
                 if ((value = strchr(options[i], '=')) == NULL)
@@ -4625,7 +4697,7 @@ static void handleError (
         SESSION*           session;
         ROUTER_INSTANCE*   inst    = (ROUTER_INSTANCE *)instance;
         ROUTER_CLIENT_SES* rses    = (ROUTER_CLIENT_SES *)router_session;
-      
+
         CHK_DCB(backend_dcb);
 
 	/** Reset error handle flag from a given DCB */
@@ -5088,8 +5160,6 @@ static int router_handle_state_switch(
 {
         backend_ref_t*     bref;
         int                rc = 1;
-        ROUTER_CLIENT_SES* rses;
-        SESSION*           ses;
         SERVER*            srv;
         
         CHK_DCB(dcb);
@@ -5110,11 +5180,8 @@ static int router_handle_state_switch(
 			srv->name,
 			srv->port,
 				STRSRVSTATUS(srv))));
-	ses = dcb->session;
-        CHK_SESSION(ses);
-
-        rses = (ROUTER_CLIENT_SES *)dcb->session->router_session;
-        CHK_CLIENT_RSES(rses);
+        CHK_SESSION(dcb->session);
+        CHK_CLIENT_RSES(dcb->session->router_session);
 
         switch (reason) {
                 case DCB_REASON_NOT_RESPONDING:

From 4706b756c25c62b89803cc5bdf1bafa0521c1d57 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 30 Jun 2015 19:16:49 +0300
Subject: [PATCH 02/17] Changed the service resource hashing function into a
 proper string hashing function.

---
 server/core/dbusers.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 935644c18..6748a1437 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -1842,18 +1842,6 @@ char *mysql_format_user_entry(void *data)
         return mysql_user;
 }
 
-/*
- * The hash function we use for storing MySQL database names.
- *
- * @param key	The key value
- * @return	The hash key
- */
-int
-resource_hash(char *key)
-{
-        return (*key + *(key + 1));
-}
-
 /**
  * Remove the resources table
  *
@@ -1877,7 +1865,7 @@ resource_alloc()
 {
 HASHTABLE       *resources;
 
-        if ((resources = hashtable_alloc(10, resource_hash, strcmp)) == NULL)
+        if ((resources = hashtable_alloc(10, simple_str_hash, strcmp)) == NULL)
         {
                 return NULL;
         }

From 53a4dd393d0ad4b77be9f1c50525abcd5f315e01 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 1 Jul 2015 05:15:08 +0300
Subject: [PATCH 03/17] Fix to a Coverity defect.

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

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index b5b4ddb36..c4008e65e 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -3653,7 +3653,7 @@ static mysql_sescmd_t* rses_property_get_sescmd(
 	if(prop == NULL)
 	{
 	    skygw_log_write(LE,"Error: NULL parameter passed to rses_property_get_sescmd. (%s:%d)",__FILE__,__LINE__);
-	    return;
+	    return NULL;
 	}
 
         CHK_RSES_PROP(prop);

From dc15fbb576ce19cca92f309f6c572238242353be Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 1 Jul 2015 16:46:32 +0300
Subject: [PATCH 04/17] Fixed build failure.

---
 server/modules/routing/readwritesplit/readwritesplit.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index c4008e65e..b801d9aec 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -5161,7 +5161,8 @@ static int router_handle_state_switch(
         backend_ref_t*     bref;
         int                rc = 1;
         SERVER*            srv;
-        
+	ROUTER_CLIENT_SES* rses;
+        SESSION*           ses;
         CHK_DCB(dcb);
         bref = (backend_ref_t *)data;
         CHK_BACKEND_REF(bref);
@@ -5180,8 +5181,10 @@ static int router_handle_state_switch(
 			srv->name,
 			srv->port,
 				STRSRVSTATUS(srv))));
-        CHK_SESSION(dcb->session);
-        CHK_CLIENT_RSES(dcb->session->router_session);
+	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:

From 5b75443744ef0a9b105efd8e40c017fd1ddeee44 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 05/17] 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 309b8bba9789de0036a48848ba4c347c717e44ca 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 06/17] 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 dc646bfbf16bf21978fedec789278379aca9f7c5 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 07/17] 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 5b95e2b32e30b9b27155f1b68243f9265e023d3b Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 6 Jul 2015 10:38:03 +0300
Subject: [PATCH 08/17] Updated 1.2 release notes.

---
 .../MaxScale-1.2.0-Release-Notes.md           | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
index caf7e28c6..de4b7a461 100644
--- a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
@@ -27,8 +27,8 @@ A quick list of changes in installation directories and file names:
 ### Client side SSL encryption
 MaxScale now supports SSL/TLS encrypted connections to MaxScale.
 
-### Monitor scripts
-State changes in backend servers can now trigger the execution of a custom script. With this you can easily customize MaxScale's behavior.
+### Launchable scripts
+Now you can configure MaxScale monitor module to automatically launch a script when it detects change in the state of a backend server. The script can be any customer script defined by you to take diagnostic or reporting action. With this you can easily customize MaxScale's behavior.
 
 ## Bug fixes
 
@@ -40,18 +40,58 @@ Here is a list of bugs fixed since the release of MaxScale 1.1.1.
 | [MXS-40](https://mariadb.atlassian.net/browse/MXS-40) | Display logged in users | 
 | [MXS-113](https://mariadb.atlassian.net/browse/MXS-113) | MaxScale seems to fail if built against MariaDB 10.0 libraries | 
 | [MXS-116](https://mariadb.atlassian.net/browse/MXS-116) | Do not run maxscale as root. | 
+| [MXS-117](https://mariadb.atlassian.net/browse/MXS-117) | Allow configuration of the log file directory | 
 | [MXS-125](https://mariadb.atlassian.net/browse/MXS-125) | inconsistency in maxkeys/maxpassword output and parameters | 
+| [MXS-128](https://mariadb.atlassian.net/browse/MXS-128) | cyclic dependency utils -> log_manager -> utils | 
 | [MXS-136](https://mariadb.atlassian.net/browse/MXS-136) | Check for MaxScale replication heartbeat table existence before creating | 
 | [MXS-137](https://mariadb.atlassian.net/browse/MXS-137) | cannot get sql for queries with length >= 0x80 | 
 | [MXS-139](https://mariadb.atlassian.net/browse/MXS-139) | Schemarouter authentication for wildcard grants fails without optimize_wildcard | 
 | [MXS-140](https://mariadb.atlassian.net/browse/MXS-140) | strip_db_esc does not work without auth_all_servers | 
-| [MXS-162](https://mariadb.atlassian.net/browse/MXS-162) | Fix Incorrect info in Configuration Guide | 
-| [MXS-163](https://mariadb.atlassian.net/browse/MXS-163) | Reload config leaks memory | 
+| [MXS-162](https://mariadb.atlassian.net/browse/MXS-162) | Fix Incorrect info in Configuration Guide |
 | [MXS-165](https://mariadb.atlassian.net/browse/MXS-165) | Concurrency issue while incrementing sessions in qlafilter | 
 | [MXS-166](https://mariadb.atlassian.net/browse/MXS-166) | Memory leak when creating a new event | 
 | [MXS-171](https://mariadb.atlassian.net/browse/MXS-171) | Allow reads on master for readwritesplit | 
 | [MXS-176](https://mariadb.atlassian.net/browse/MXS-176) | Missing dependencies in documentation | 
+| [MXS-180](https://mariadb.atlassian.net/browse/MXS-180) | MariaDB10 binlog router compatibilty |
 | [MXS-181](https://mariadb.atlassian.net/browse/MXS-181) | Poor performance on TCP connection due to Nagle's algoritm | 
+| [MXS-182](https://mariadb.atlassian.net/browse/MXS-182) | SHOW SLAVE STATUS and maxadmin "show services" for binlog router needs updated when used with MariaDB 10 Master | 
 | [MXS-212](https://mariadb.atlassian.net/browse/MXS-212) | Stopped services accept connections | 
 | [MXS-225](https://mariadb.atlassian.net/browse/MXS-225) | RPM Debug build packages have no debugging symbols | 
 | [MXS-227](https://mariadb.atlassian.net/browse/MXS-227) | Memory leak in Galera Monitor | 
+| [MXS-244](https://mariadb.atlassian.net/browse/MXS-244) | Memory leak when using prepared statements without arguments | 
+
+## Known Issues and Limitations
+
+There are a number bugs and known limitations within this version of MaxScale, the most serious of this are listed below.
+
+* 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.
+
+* 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.
+
+* LONGBLOB are currently not supported.
+
+* Galera Cluster variables, such as @@wsrep_node_name, are not resolved by the embedded MariaDB parser.
+
+* The Database Firewall filter does not support multi-statements. Using them will result in an error being sent to the client.   
+
+## Packaging
+
+Both RPM and Debian packages are available for MaxScale in addition to the tar based releases previously distributed we now provide
+
+* CentOS/RedHat 5
+
+* CentOS/RedHat 6
+
+* CentOS/RedHat 7
+
+* Debian 6
+
+* Debian 7
+
+* Ubuntu 12.04 LTS
+
+* Ubuntu 14.04 LTS
+
+* SuSE Linux Enterprise 11
+
+* SuSE Linux Enterprise 12

From 1af73b706148a64a470f79be297791b2586dbdd3 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 09/17] 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 5bdfa42aa7c961097933bc9961a81f61a39def5e Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 06:31:52 +0300
Subject: [PATCH 10/17] Fixed Building from Source document.

---
 .../Building-MaxScale-from-Source-Code.md     | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
index 95236ed7e..2d8f0661e 100644
--- a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
+++ b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
@@ -87,16 +87,13 @@ You will also need some version specific packages.
 
 #### Earlier versions of Ubuntu or Debian
 
-For these, you will need to obtain the MariaDB embedded library. It has to be manually extracted from the tarball. But first ascertain what version of glibc is installed. Run the command:
+For these, you will need to obtain the MariaDB embedded library. It has to be manually extracted from the tarballs at the MariaDB site. But first ascertain what version of glibc is installed. Run the command:
 
 ```
 	dpkg -l | grep libc6
 ```
 
-which will show the version number. If the version is less than 2.14 you should obtain the library from:
-[https://downloads.mariadb.org/interstitial/mariadb-5.5.41/bintar-linux-x86_64/mariadb-5.5.41-linux-x86_64.tar.gz](https://downloads.mariadb.org/interstitial/mariadb-5.5.41/bintar-linux-x86_64/mariadb-5.5.41-linux-x86_64.tar.gz). 
-Otherwise, from:
-[https://downloads.mariadb.org/interstitial/mariadb-5.5.41/bintar-linux-glibc_214-x86_64/mariadb-5.5.41-linux-glibc_214-x86_64.tar.gz](https://downloads.mariadb.org/interstitial/mariadb-5.5.41/bintar-linux-glibc_214-x86_64/mariadb-5.5.41-linux-glibc_214-x86_64.tar.gz)
+which will show the version number. For versions older than 2.14 you should obtain the library which supports GLIBC versions older than 2.14 and for newer versions, the library which supports newer GLIBC versions should be used.
 
 The suggested location for extracting the tarball is `/usr` so the operation can be done by the following commands:
 
@@ -107,22 +104,6 @@ The suggested location for extracting the tarball is `/usr` so the operation can
 
 where /path/to/mariadb.library.tar.gz is replaced by the actual path and name of the downloaded tarball.
 
-## OpenSUSE
-
-At the time this guide was written, the MariaDB development packages for OpenSUSE were broken and the build failed.
-
-The packages required are:
-
-```
-gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc_s1 perl 
-make libtool libopenssl-devel libaio libaio-devel 
-libedit-devel librabbitmq-devel
-	MariaDB-devel MariaDB-client MariaDB-server
-```
-
-If zypper ask which MariaDB client should be installed `MariaDB-client` or `mariadb-client`
-	 please select `MariaDB-client`. This is the package provided by the MariaDB repository.
-
 # Obtaining the MaxScale Source Code
 
 Now clone the GitHub project to your machine either via the web interface, your favorite graphical interface or the git command line
@@ -152,16 +133,15 @@ wipe the build directory clean without the danger of deleting important files wh
 something goes wrong. Building 'out-of-source' also allows you to have multiple 
 configurations of MaxScale at the same time.
 
-The default values that CMake uses can be found in the 'macros.cmake' file. 
-If you wish to change these, edit the 'macros.cmake' file or define the 
-variables manually at configuration time.
+The default values that MaxScale uses for CMake can be found in the 'macros.cmake' file under the `cmake` folder. 
+If you wish to change these, edit the 'macros.cmake' file or define the variables manually at configuration time.
 
 To display all CMake variables with their descriptions:
 
 ```
 cmake .. -LH
 ```
-This is a useful command if you have your libraries installed in non-standard locations.
+This is a useful command if you have your libraries installed in non-standard locations and need to provide them manually.
 
 When you are ready to run cmake, provide the following command:
 
@@ -241,7 +221,7 @@ $ make install
 
 This will result in an installation being created which is identical to that which would be achieved by installing the binary package.
 
-By default, MaxScale installs to `/usr/local/mariadb-maxscale` and places init.d scripts and ldconfig files into their folders. Change the `CMAKE_INSTALL_PREFIX` variable to your desired installation directory and set `WITH_SCRIPTS=N` to prevent the init.d script and ldconfig file installation.
+When building from source, MaxScale installs to `/usr/local/` and places init.d scripts and ldconfig files into their folders. Change the `CMAKE_INSTALL_PREFIX` variable to your desired installation directory and set `WITH_SCRIPTS=N` to prevent the init.d script and ldconfig file installation.
 
 Other useful targets for Make are `documentation`, which generates the Doxygen documentation, and `uninstall` which uninstall MaxScale binaries after an install.
 

From 9d5d6da865d11a5daf391ad0562f0a7472bb2259 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 06:33:49 +0300
Subject: [PATCH 11/17] Removed Fedora references from the source building
 documentation.

---
 .../Building-MaxScale-from-Source-Code.md          | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
index 2d8f0661e..96147c0f1 100644
--- a/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
+++ b/Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md
@@ -22,9 +22,9 @@ After following the instructions on that site you should have a working MariaDB
 
 The full list of dependencies for the most common distributions is provided in this section. If your system is not listed here, MaxScale building isn't guaranteed to be compatible but might still be successful.
 
-## RHEL, CentOS and Fedora
+## RHEL and CentOS
 
-You will need to install all of the following packages for all versions of RHEL, CentOS and Fedora.
+You will need to install all of the following packages for all versions of RHEL and CentOS.
 
 ```
 gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool 
@@ -39,7 +39,7 @@ rpm-build
 
 There are also some version specific packages you need to install.
 
-#### RHEL 6, 7, CentOS 6, 7, Fedora:
+#### RHEL 6, 7, CentOS 6, 7:
 
 ```
 libedit-devel
@@ -51,17 +51,11 @@ libedit-devel
 mariadb-devel mariadb-embedded-devel 
 ```
 
-#### RHEL 5, 6, CentOS 5, 6, Fedora 19, 20
+#### RHEL 5, 6, CentOS 5, 6
 ```
 MariaDB-devel MariaDB-server
 ```
 
-#### Fedora 19, 20
-
-```
-systemtap-sdt-devel
-```
-
 ## Ubuntu and Debian
 
 These packages are required on all versions of Ubuntu and Debian.

From c2e51f2e983df1bbd47f9253c7106a2041545a8a Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 08:16:29 +0300
Subject: [PATCH 12/17] Fix to MXS-223:
 https://mariadb.atlassian.net/browse/MXS-223 Added a temporary buffer to
 prevent losing the pointer to the cloned buffer when dcb->func.write fails.

---
 .../routing/readwritesplit/readwritesplit.c   | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 3c329f646..be2fb68df 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -4011,7 +4011,7 @@ static bool execute_sescmd_in_backend(
 	bool             succp;
 	int              rc = 0;
 	sescmd_cursor_t* scur;
-
+	GWBUF* buf;
 	if(backend_ref == NULL)
 	{
 	    skygw_log_write(LE,"Error: NULL parameter passed to execute_sescmd_in_backend. (%s:%d)",__FILE__,__LINE__);
@@ -4048,27 +4048,9 @@ static bool execute_sescmd_in_backend(
                 /** Cursor is left active when function returns. */
                 sescmd_cursor_set_active(scur, true);
         }
-#if defined(SS_DEBUG)
-        LOGIF(LT, tracelog_routed_query(scur->scmd_cur_rses, 
-                                        "execute_sescmd_in_backend", 
-                                        backend_ref, 
-                                        sescmd_cursor_clone_querybuf(scur)));
 
-        {
-                GWBUF* tmpbuf = sescmd_cursor_clone_querybuf(scur);
-                uint8_t* ptr = GWBUF_DATA(tmpbuf);
-                unsigned char cmd = MYSQL_GET_COMMAND(ptr);
-                
-                LOGIF(LD, (skygw_log_write(
-                        LOGFILE_DEBUG,
-                        "%lu [execute_sescmd_in_backend] Just before write, fd "
-                        "%d : cmd %s.",
-                        pthread_self(),
-                        dcb->fd,
-                        STRPACKETTYPE(cmd))));
-                gwbuf_free(tmpbuf);
-        }
-#endif /*< SS_DEBUG */
+	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 */
@@ -4077,7 +4059,7 @@ static bool execute_sescmd_in_backend(
                                 dcb, 
                                 NULL, 
                                 dcb->session, 
-                                sescmd_cursor_clone_querybuf(scur));
+                                buf);
                         break;
 
 		case MYSQL_COM_INIT_DB:
@@ -4103,10 +4085,11 @@ static bool execute_sescmd_in_backend(
                          * Mark session command buffer, it triggers writing 
                          * MySQL command to protocol
                          */
+
                         gwbuf_set_type(scur->scmd_cur_cmd->my_sescmd_buf, GWBUF_TYPE_SESCMD);
                         rc = dcb->func.write(
                                 dcb, 
-                                sescmd_cursor_clone_querybuf(scur));
+                                buf);
                         break;
         }
 
@@ -4116,6 +4099,7 @@ static bool execute_sescmd_in_backend(
         }
         else
         {
+		while((buf = GWBUF_CONSUME_ALL(buf)) != NULL);
                 succp = false;
         }
 return_succp:

From f7e165612f6d20d4b6f790c33b76432ccce28b05 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 14:40:13 +0300
Subject: [PATCH 13/17] Added Upgrading to 1.2 document.

---
 Documentation/Upgrading-To-MaxScale-1.2.0.md | 24 ++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Documentation/Upgrading-To-MaxScale-1.2.0.md

diff --git a/Documentation/Upgrading-To-MaxScale-1.2.0.md b/Documentation/Upgrading-To-MaxScale-1.2.0.md
new file mode 100644
index 000000000..a48750076
--- /dev/null
+++ b/Documentation/Upgrading-To-MaxScale-1.2.0.md
@@ -0,0 +1,24 @@
+# Upgrading MaxScale from 1.1 to 1.2
+
+This document describes upgrading MaxScale from version 1.1.1 to 1.2 and the major differences in the new version compared to the old version. The major changes can be found in the `Changelog.txt` file in the installation directory and the official release notes in the `ReleaseNotes.txt` file.
+
+## Installation
+
+Before starting the upgrade, we recommend you back up your configuration, log and binary log files in `/usr/local/mariadb-maxscale/`.
+
+Upgrading MaxScale will copy the `MaxScale.cnf` file in `/usr/local/mariadb-maxscale/etc/` to `/etc/` and renamed to `maxscale.cnf`. Binary log files are not automatically copied and should be manually moved from `/usr/local/mariadb-maxscale` to `/var/lib/maxscale/`.
+
+## File location changes
+
+MaxScale 1.2 follows the [FHS-standard](http://www.pathname.com/fhs/) and installs to `/usr/` and `/var/` subfolders. Here are the major changes and file locations.
+
+* Configuration files are located in `/etc/` and use lowercase letters: `/etc/maxscale.cnf`
+* Binary files are in `/usr/bin/`
+* Libraries and modules are in `/usr/lib64/maxscale/`. If you are using custom modules, please make sure they are in this directory before starting MaxScale.
+* Log files are in the `var/log/maxscale/` folder
+* MaxScale's PID file is located in `/var/run/maxscale/maxscale.pid`
+* Data files and other persistent files are in `/var/lib/maxscale/`
+
+## Running MaxScale without root permissions
+
+MaxScale can run as a non-root user with the 1.2 version. RPM and DEB packages install the `maxscale` user and `maxscale` group which are used by the init scripts and systemd configuration files. If you are installing from a binary tarball, you can run the `postinst` script included in it to manually create these groups.

From 309e6881688e20a79d0ed054c461f6b30e7530c6 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 15:03:23 +0300
Subject: [PATCH 14/17] Added link to 1.2 upgrade document in
 Documentation-Contents.md

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

diff --git a/Documentation/Documentation-Contents.md b/Documentation/Documentation-Contents.md
index fc51d83ec..f19797d55 100644
--- a/Documentation/Documentation-Contents.md
+++ b/Documentation/Documentation-Contents.md
@@ -19,7 +19,8 @@
 
 ## Upgrading MaxScale
 
-- [Upgrading MaxScale to 1.1.0](Upgrading-To-MaxScale-1.1.0.md)
+- [Upgrading MaxScale from 1.1.1 to 1.2.0](Upgrading-To-MaxScale-1.2.0.md)
+- [Upgrading MaxScale from 1.0.5 to 1.1.0](Upgrading-To-MaxScale-1.1.0.md)
 
 ## Reference
 

From 082a78ac3ded5947f2d0af6ca1a6ad7d04099eb4 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 16:02:29 +0300
Subject: [PATCH 15/17] Updated release notes.

---
 .../MaxScale-1.2.0-Release-Notes.md           | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
index de4b7a461..c1252a932 100644
--- a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
@@ -34,31 +34,30 @@ Now you can configure MaxScale monitor module to automatically launch a script w
 
 Here is a list of bugs fixed since the release of MaxScale 1.1.1.
 
-| Key | Summary | 
-| --- | -------- | 
-| [MXS-24](https://mariadb.atlassian.net/browse/MXS-24) | bugzillaId-604: Module load path documentation issues ... | 
-| [MXS-40](https://mariadb.atlassian.net/browse/MXS-40) | Display logged in users | 
-| [MXS-113](https://mariadb.atlassian.net/browse/MXS-113) | MaxScale seems to fail if built against MariaDB 10.0 libraries | 
-| [MXS-116](https://mariadb.atlassian.net/browse/MXS-116) | Do not run maxscale as root. | 
-| [MXS-117](https://mariadb.atlassian.net/browse/MXS-117) | Allow configuration of the log file directory | 
-| [MXS-125](https://mariadb.atlassian.net/browse/MXS-125) | inconsistency in maxkeys/maxpassword output and parameters | 
-| [MXS-128](https://mariadb.atlassian.net/browse/MXS-128) | cyclic dependency utils -> log_manager -> utils | 
-| [MXS-136](https://mariadb.atlassian.net/browse/MXS-136) | Check for MaxScale replication heartbeat table existence before creating | 
-| [MXS-137](https://mariadb.atlassian.net/browse/MXS-137) | cannot get sql for queries with length >= 0x80 | 
-| [MXS-139](https://mariadb.atlassian.net/browse/MXS-139) | Schemarouter authentication for wildcard grants fails without optimize_wildcard | 
-| [MXS-140](https://mariadb.atlassian.net/browse/MXS-140) | strip_db_esc does not work without auth_all_servers | 
-| [MXS-162](https://mariadb.atlassian.net/browse/MXS-162) | Fix Incorrect info in Configuration Guide |
-| [MXS-165](https://mariadb.atlassian.net/browse/MXS-165) | Concurrency issue while incrementing sessions in qlafilter | 
-| [MXS-166](https://mariadb.atlassian.net/browse/MXS-166) | Memory leak when creating a new event | 
-| [MXS-171](https://mariadb.atlassian.net/browse/MXS-171) | Allow reads on master for readwritesplit | 
-| [MXS-176](https://mariadb.atlassian.net/browse/MXS-176) | Missing dependencies in documentation | 
-| [MXS-180](https://mariadb.atlassian.net/browse/MXS-180) | MariaDB10 binlog router compatibilty |
-| [MXS-181](https://mariadb.atlassian.net/browse/MXS-181) | Poor performance on TCP connection due to Nagle's algoritm | 
-| [MXS-182](https://mariadb.atlassian.net/browse/MXS-182) | SHOW SLAVE STATUS and maxadmin "show services" for binlog router needs updated when used with MariaDB 10 Master | 
-| [MXS-212](https://mariadb.atlassian.net/browse/MXS-212) | Stopped services accept connections | 
-| [MXS-225](https://mariadb.atlassian.net/browse/MXS-225) | RPM Debug build packages have no debugging symbols | 
-| [MXS-227](https://mariadb.atlassian.net/browse/MXS-227) | Memory leak in Galera Monitor | 
-| [MXS-244](https://mariadb.atlassian.net/browse/MXS-244) | Memory leak when using prepared statements without arguments | 
+ * [MXS-24](https://mariadb.atlassian.net/browse/MXS-24):  bugzillaId-604: Module load path documentation issues ...  
+ * [MXS-40](https://mariadb.atlassian.net/browse/MXS-40):  Display logged in users  
+ * [MXS-113](https://mariadb.atlassian.net/browse/MXS-113):  MaxScale seems to fail if built against MariaDB 10.0 libraries  
+ * [MXS-116](https://mariadb.atlassian.net/browse/MXS-116):  Do not run maxscale as root.  
+ * [MXS-117](https://mariadb.atlassian.net/browse/MXS-117):  Allow configuration of the log file directory  
+ * [MXS-125](https://mariadb.atlassian.net/browse/MXS-125):  inconsistency in maxkeys/maxpassword output and parameters  
+ * [MXS-128](https://mariadb.atlassian.net/browse/MXS-128):  cyclic dependency utils -> log_manager -> utils  
+ * [MXS-136](https://mariadb.atlassian.net/browse/MXS-136):  Check for MaxScale replication heartbeat table existence before creating  
+ * [MXS-137](https://mariadb.atlassian.net/browse/MXS-137):  cannot get sql for queries with length >= 0x80  
+ * [MXS-139](https://mariadb.atlassian.net/browse/MXS-139):  Schemarouter authentication for wildcard grants fails without optimize_wildcard  
+ * [MXS-140](https://mariadb.atlassian.net/browse/MXS-140):  strip_db_esc does not work without auth_all_servers  
+ * [MXS-162](https://mariadb.atlassian.net/browse/MXS-162):  Fix Incorrect info in Configuration Guide 
+ * [MXS-165](https://mariadb.atlassian.net/browse/MXS-165):  Concurrency issue while incrementing sessions in qlafilter  
+ * [MXS-166](https://mariadb.atlassian.net/browse/MXS-166):  Memory leak when creating a new event  
+ * [MXS-171](https://mariadb.atlassian.net/browse/MXS-171):  Allow reads on master for readwritesplit  
+ * [MXS-176](https://mariadb.atlassian.net/browse/MXS-176):  Missing dependencies in documentation  
+ * [MXS-179](https://mariadb.atlassian.net/browse/MXS-179):  Keep configuration  changes in synch across MaxScale Mate Nodes  
+ * [MXS-180](https://mariadb.atlassian.net/browse/MXS-180):  MariaDB10 binlog router compatibilty 
+ * [MXS-181](https://mariadb.atlassian.net/browse/MXS-181):  Poor performance on TCP connection due to Nagle's algoritm  
+ * [MXS-182](https://mariadb.atlassian.net/browse/MXS-182):  SHOW SLAVE STATUS and maxadmin "show services" for binlog router needs updated when used with MariaDB 10 Master  
+ * [MXS-212](https://mariadb.atlassian.net/browse/MXS-212):  Stopped services accept connections  
+ * [MXS-225](https://mariadb.atlassian.net/browse/MXS-225):  RPM Debug build packages have no debugging symbols  
+ * [MXS-227](https://mariadb.atlassian.net/browse/MXS-227):  Memory leak in Galera Monitor  
+ * [MXS-244](https://mariadb.atlassian.net/browse/MXS-244):  Memory leak when using prepared statements without arguments 
 
 ## Known Issues and Limitations
 

From 72844c9e138ebd6c92785df1ca027f8a21e7af1d Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 7 Jul 2015 16:22:26 +0300
Subject: [PATCH 16/17] Added lsyncd guide to release notes.

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

diff --git a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
index c1252a932..43560ddff 100644
--- a/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-1.2.0-Release-Notes.md
@@ -30,6 +30,9 @@ MaxScale now supports SSL/TLS encrypted connections to MaxScale.
 ### Launchable scripts
 Now you can configure MaxScale monitor module to automatically launch a script when it detects change in the state of a backend server. The script can be any customer script defined by you to take diagnostic or reporting action. With this you can easily customize MaxScale's behavior.
 
+### Lsyncd configuration guide
+A new tutorial has beed added which helps you keep MaxScale's configuration files in sync across multiple hosts. This allows for easier HA setups with MaxScale and guarantees up-to-date configuration files on all nodes. The tutorial can be found [here](../Reference/MaxScale-HA-with-lsyncd.md).
+
 ## Bug fixes
 
 Here is a list of bugs fixed since the release of MaxScale 1.1.1.

From b73aedd0ca9e36474ac6407aeff6fc4ef27b7cb0 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 8 Jul 2015 10:05:15 +0300
Subject: [PATCH 17/17] Fixed debug log not working.

---
 log_manager/log_manager.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc
index a87157be7..79c2ace30 100644
--- a/log_manager/log_manager.cc
+++ b/log_manager/log_manager.cc
@@ -1457,7 +1457,7 @@ int skygw_log_write(
          * Write log string to buffer and add to file write list.
          */
 
-        for (i = LOGFILE_FIRST; i<LOGFILE_LAST; i <<=1)
+        for (i = LOGFILE_FIRST; i<=LOGFILE_LAST; i <<=1)
         {
             /**
              * If particular log is disabled in general and it is not enabled for