Merge branch 'release-1.0beta-refresh' into cmake_build

2014-09-15 09:43:24 +03:00
parent 0f07c9f08c c2847c7ddb
commit 4c41dea6fb
14 changed files with 228 additions and 33 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -1949,7 +1949,7 @@ static int routeQuery(
 	}
 	rses_end_locked_router_action(router_cli_ses);
 retblock:
-#if defined(SS_DEBUG)
+#if defined(SS_DEBUG2)
        {
                char* canonical_query_str;