Merge branch '2.0' into develop

2016-09-09 15:12:58 +03:00
parent 07588a515d abd1ea53a6
commit d7f79942be
48 changed files with 1658 additions and 547 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -1384,7 +1384,6 @@ static route_target_t get_route_target(ROUTER_CLIENT_SES *rses,
    }
    else
    {
-        /** hints don't affect on routing */
        ss_dassert(trx_active ||
                   (QUERY_IS_TYPE(qtype, QUERY_TYPE_WRITE) ||
                    QUERY_IS_TYPE(qtype, QUERY_TYPE_MASTER_READ) ||