From 805e3578a27199c63202f8220ec338f37979ead2 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 2 Mar 2018 03:58:16 +0200
Subject: [PATCH] MXS-1475 Address review issues

- Clean up session header.
- Add test case
---
 include/maxscale/session.h                                  | 6 ++----
 .../protocol/MySQL/mariadbclient/test/test_setparser.cc     | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/maxscale/session.h b/include/maxscale/session.h
index 45c0771a2..c3c509381 100644
--- a/include/maxscale/session.h
+++ b/include/maxscale/session.h
@@ -154,6 +154,8 @@ typedef struct session_variable
 } SESSION_VARIABLE;
 
 typedef std::tr1::unordered_map<std::string, SESSION_VARIABLE> SessionVarsByName;
+#else
+typedef void SessionVarsByName;
 #endif
 
 /**
@@ -190,11 +192,7 @@ typedef struct session
         const struct server *target; /**< Where the statement was sent */
     } stmt;  /**< Current statement being executed */
     bool qualifies_for_pooling; /**< Whether this session qualifies for the connection pool */
-#ifdef __cplusplus
     SessionVarsByName*      variables;        /*< @maxscale variables associated with this session */
-#else
-    void*                   variables;
-#endif
     skygw_chk_t             ses_chk_tail;
 } MXS_SESSION;
 
diff --git a/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc b/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc
index 86f0c213c..7c4561a37 100644
--- a/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/test/test_setparser.cc
@@ -218,6 +218,12 @@ struct TEST_CASE
         "@MAXSCALE.CACHE.ENABLED",
         "TRUE"
     },
+    {
+        "SET @MAXSCALE.CACHE.ENABLED = TRUE, @maxscale.cache.enabled = FALSE",
+        P::IS_SET_MAXSCALE,
+        "@maxscale.cache.enabled",
+        "FALSE"
+    },
 };
 
 const int N_TEST_CASES = sizeof(test_cases) / sizeof(test_cases[0]);