Merge branch '2.3' into 2.4

2019-08-29 02:00:16 +03:00
parent a09c2a800d 7a1abc26d8
commit 0bb53bf411
7 changed files with 96 additions and 12 deletions
--- a/server/modules/routing/schemarouter/schemaroutersession.hh
+++ b/server/modules/routing/schemarouter/schemaroutersession.hh
@ -129,7 +129,7 @@ private:
    bool       get_shard_dcb(DCB** dcb, const char* name);
    bool       have_servers();
    bool       handle_default_db();
-    bool       ignore_duplicate_database(const char* data);
+    bool       ignore_duplicate_table(const std::string& data);
    SERVER*    get_query_target(GWBUF* buffer);
    SERVER*    get_ps_target(GWBUF* buffer, uint32_t qtype, qc_query_op_t op);