From 4eddec7989d4254cd20b696e92e5d2671068c90b Mon Sep 17 00:00:00 2001
From: Sriram Patil <spsrirampatil@gmail.com>
Date: Wed, 20 May 2015 17:47:58 +0530
Subject: [PATCH 1/2] Fixed MXS - 165: Concurrency issue while incrementing
 sessions in qlafilter

---
 server/modules/filter/qlafilter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c
index 5362cf61e..3c358cda1 100644
--- a/server/modules/filter/qlafilter.c
+++ b/server/modules/filter/qlafilter.c
@@ -50,6 +50,7 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <string.h>
+#include <atomic.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;
@@ -304,7 +305,9 @@ char		*remote, *userName;
 		sprintf(my_session->filename, "%s.%d", 
 			my_instance->filebase,
 			my_instance->sessions);
-		my_instance->sessions++;
+
+        // Multiple sessions can try to update my_instance->sessions simultaneously
+		atomic_add(&(my_instance->sessions), 1);
 		
 		if (my_session->active)
 		{

From f24da8712b4c4cbf5c1bf731a6133cae39d62245 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 11 Jun 2015 18:25:42 +0300
Subject: [PATCH 2/2] Fixed a segfault and disabled syslog by default.

---
 server/core/gateway.c | 46 +++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/server/core/gateway.c b/server/core/gateway.c
index 9845713e1..9d0e6f908 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -935,7 +935,7 @@ int main(int argc, char **argv)
 	char* tmp_var;
 	int      option_index;
 	int	 logtofile = 0;	      	      /* Use shared memory or file */
-	int	 syslog_enabled = 1; /** Log to syslog */
+	int	 syslog_enabled = 0; /** Log to syslog */
 	int	 maxscalelog_enabled = 1; /** Log with MaxScale */
         ssize_t  log_flush_timeout_ms = 0;
         sigset_t sigset;
@@ -1078,26 +1078,34 @@ int main(int argc, char **argv)
 		    }
 		    break;
 		case 'S':
-		    if(strstr(optarg,"="))
-		    {
-			strtok(optarg,"= ");
-			maxscalelog_enabled = config_truth_value(strtok(NULL,"= "));
-		    }
-		    else
-		    {
-			maxscalelog_enabled = config_truth_value(optarg);
-		    }
+            {
+                char* tok = strstr(optarg,"=");
+                if(tok)
+                {
+                    tok++;
+                    if(tok)
+                        maxscalelog_enabled = config_truth_value(tok);
+                }
+                else
+                {
+                    maxscalelog_enabled = config_truth_value(optarg);
+                }
+            }
 		    break;
 		case 's':
-		    if(strstr(optarg,"="))
-		    {
-			strtok(optarg,"= ");
-			syslog_enabled = config_truth_value(strtok(NULL,"= "));
-		    }
-		    else
-		    {
-			syslog_enabled = config_truth_value(optarg);
-		    }
+            {
+                char* tok = strstr(optarg,"=");
+                if(tok)
+                {
+                    tok++;
+                    if(tok)
+                        syslog_enabled = config_truth_value(tok);
+                }
+                else
+                {
+                    syslog_enabled = config_truth_value(optarg);
+                }
+            }
 		    break;
 		case 'U':
 		    if(set_user(optarg) != 0)