Merge remote-tracking branch 'origin/MAX-324' into MAX-324

Conflicts: server/modules/routing/dbshard/dbshard.c
2014-12-07 06:11:24 +02:00
parent a580799eb2 68fc849c6e
commit 15a96f037d
9 changed files with 476 additions and 850 deletions
--- a/server/modules/routing/dbshard/dbshard.c
+++ b/server/modules/routing/dbshard/dbshard.c
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -3220,8 +3220,6 @@ static bool select_connect_backend_servers(
                                atomic_add(&backend_ref[i].bref_backend->backend_conn_count, -1);
                        }
                }
-                master_connected = false;
-                slaves_connected = 0;
        }
 return_succp: