Merge branch '2.1' into develop

2017-03-09 10:02:36 +02:00
parent e1a1959bc2 41ff01d16d
commit 415001a4cd
19 changed files with 210 additions and 42 deletions
--- a/server/modules/filter/cache/cachefiltersession.cc
+++ b/server/modules/filter/cache/cachefiltersession.cc
@ -232,6 +232,20 @@ int CacheFilterSession::routeQuery(GWBUF* pPacket)
        }
        break;

+    case MYSQL_COM_STMT_PREPARE:
+        if (log_decisions())
+        {
+            MXS_NOTICE("MYSQL_COM_STMT_PREPARE, ignoring.");
+        }
+        break;
+
+    case MYSQL_COM_STMT_EXECUTE:
+        if (log_decisions())
+        {
+            MXS_NOTICE("MYSQL_COM_STMT_EXECUTE, ignoring.");
+        }
+        break;
+
    case MYSQL_COM_QUERY:
        if (should_consult_cache(pPacket))
        {