Merge branch 'develop' into schemarouter_refresh

2015-07-02 12:20:14 +03:00
parent 3c275b5266 29ad3aaf5d
commit 3989e0dc6b
14 changed files with 272 additions and 62 deletions
--- a/server/modules/include/readwritesplit.h
+++ b/server/modules/include/readwritesplit.h
@ -252,6 +252,7 @@ typedef struct rwsplit_config_st {
        int               rw_max_sescmd_history_size;
        bool disable_sescmd_hist;
        bool disable_slave_recovery;
+        bool master_reads; /*< Use master for reads */
 } rwsplit_config_t;