Merge branch '2.3' into develop

2019-06-03 13:46:13 +03:00
parent 625741d8ba c219187a1e
commit 44d1b821c3
24 changed files with 357 additions and 57 deletions
--- a/server/modules/routing/readwritesplit/rwsplitsession.hh
+++ b/server/modules/routing/readwritesplit/rwsplitsession.hh
@ -186,6 +186,7 @@ private:
    int             get_max_replication_lag();
    mxs::RWBackend* get_backend_from_dcb(DCB* dcb);

+    bool retry_master_query(mxs::RWBackend* backend);
    void handle_error_reply_client(DCB* backend_dcb, GWBUF* errmsg);
    bool handle_error_new_connection(DCB* backend_dcb, GWBUF* errmsg);
    void manage_transactions(mxs::RWBackend* backend, GWBUF* writebuf);