Merge branch '2.3' into develop

2019-05-10 09:28:39 +03:00
parent b4e8f79c5f 142038051c
commit 0d13e694e4
7 changed files with 76 additions and 18 deletions
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@ -173,6 +173,8 @@ public:
     */
    int routeQuery(GWBUF* buffer);

+    void queue_client_callback();
+
 private:
    AvroSession(Avro* instance, MXS_SESSION* session);

@ -186,7 +188,6 @@ private:
    bool stream_data();
    void rotate_avro_file(std::string fullname);
    void client_callback();
-    void queue_client_callback();
 };

 void read_table_info(uint8_t* ptr,