Merge branch '2.1' into develop

Bringing in MXS-1406

include/maxscale/query_classifier.h

@@ -95,6 +95,7 @@ typedef enum qc_query_op
     QUERY_OP_UNDEFINED = 0,
 
     QUERY_OP_ALTER,
+    QUERY_OP_CALL,
     QUERY_OP_CHANGE_DB,
     QUERY_OP_CREATE,
     QUERY_OP_DELETE,

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -2042,6 +2042,10 @@ int32_t qc_mysql_get_operation(GWBUF* querybuf, int32_t* operation)
                         *operation = QUERY_OP_EXECUTE;
                         break;
 
+                    case SQLCOM_CALL:
+                        *operation = QUERY_OP_CALL;
+                        break;
+
                     default:
                         *operation = QUERY_OP_UNDEFINED;
                     }

query_classifier/qc_sqlite/qc_sqlite.cc

@@ -2014,6 +2014,7 @@ public:
 
         m_status = QC_QUERY_PARSED;
         m_type_mask = QUERY_TYPE_WRITE;
+        m_operation = QUERY_OP_CALL;
 
         if (pExprList)
         {

query_classifier/test/maxscale.test

@@ -83,4 +83,7 @@ SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*';
 select * from db1.t1 union select * from db2.t2;
 
 # Names is a keyword as well
-select names from t;
+select names from t;
+
+call p1();
+call p1(@var);

server/core/query_classifier.cc

@@ -362,6 +362,9 @@ const char* qc_op_to_string(qc_query_op_t op)
     case QUERY_OP_ALTER:
         return "QUERY_OP_ALTER";
 
+    case QUERY_OP_CALL:
+        return "QUERY_OP_CALL";
+
     case QUERY_OP_CHANGE_DB:
         return "QUERY_OP_CHANGE_DB";