Merge branch '2.2' into develop

include/maxscale/query_classifier.h

@@ -84,7 +84,8 @@ typedef enum qc_query_type
     QUERY_TYPE_CREATE_TMP_TABLE   = 0x080000, /*< Create temporary table:master (could be all) */
     QUERY_TYPE_READ_TMP_TABLE     = 0x100000, /*< Read temporary table:master (could be any) */
     QUERY_TYPE_SHOW_DATABASES     = 0x200000, /*< Show list of databases */
-    QUERY_TYPE_SHOW_TABLES        = 0x400000  /*< Show list of tables */
+    QUERY_TYPE_SHOW_TABLES        = 0x400000, /*< Show list of tables */
+    QUERY_TYPE_DEALLOC_PREPARE    = 0x1000000 /*< Dealloc named prepare stmt:all */
 } qc_query_type_t;
 
 /**

include/maxscale/queryclassifier.hh

@@ -217,6 +217,13 @@ public:
      */
     void ps_store(GWBUF* buffer, uint32_t id);
 
+    /**
+     * @brief Remove a prepared statement
+     *
+     * @param buffer Buffer containing a DEALLOCATE statement or a binary protocol command
+     */
+    void ps_erase(GWBUF* buffer);
+
     /**
      * @brief Store a mapping from an external id to the corresponding internal id
      *
@@ -297,14 +304,6 @@ private:
     uint32_t ps_get_type(uint32_t id) const;
     uint32_t ps_get_type(std::string id) const;
 
-    /**
-     * @brief Remove a prepared statement
-     *
-     * @param id Statement identifier to remove
-     */
-    void ps_erase(std::string id);
-    void ps_erase(uint32_t id);
-
     /**
      * @brief Get the internal ID for the given binary prepared statement
      *