Merge branch '2.3' into develop

2019-04-23 12:05:18 +03:00
parent 9e3f0aab5a ba79028a46
commit 4186f39616
26 changed files with 134 additions and 78 deletions
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@ -173,11 +173,6 @@ public:
     */
    int routeQuery(GWBUF* buffer);

-    /**
-     * Handler for the EPOLLOUT event
-     */
-    void client_callback();
-
 private:
    AvroSession(Avro* instance, MXS_SESSION* session);

@ -190,6 +185,8 @@ private:
    bool seek_to_gtid();
    bool stream_data();
    void rotate_avro_file(std::string fullname);
+    void client_callback();
+    void queue_client_callback();
 };

 void read_table_info(uint8_t* ptr,