From ec7d748275b581546306b916911d768ed5b530bc Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Thu, 20 Feb 2014 16:28:54 +0100 Subject: [PATCH] Code clean up and removed text typos in comments Code clean up and removed text typos in comments --- server/modules/routing/readconnroute.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c index a467ea2e6..6121a0502 100644 --- a/server/modules/routing/readconnroute.c +++ b/server/modules/routing/readconnroute.c @@ -61,8 +61,9 @@ * 31/07/2013 Massimiliano Pinto Added a check for candidate server, if NULL return * 12/08/2013 Mark Riddoch Log unsupported router options * 04/09/2013 Massimiliano Pinto Added client NULL check in clientReply - * 22/10/2013 Massimiliano Pinto errorReply called from backend, for client error replyi + * 22/10/2013 Massimiliano Pinto errorReply called from backend, for client error reply * or take different actions such as open a new backend connection + * 20/02/2014 Massimiliano Pinto If router_options=slave, route traffic to master if no slaves available * * @endverbatim */ @@ -339,7 +340,7 @@ int master_host = -1; /* * If router_options=slave, get the running master - * It will be used if there arw no running slaves at all + * It will be used if there are no running slaves at all */ if (inst->bitvalue == SERVER_SLAVE) { if (master_host < 0 && (SERVER_IS_MASTER(inst->servers[i]->server))) { @@ -379,7 +380,7 @@ int master_host = -1; } } - /* The are no candidate server here! + /* There is no candidate server here! * With router_option=slave a master_host could be set, so route traffic there. * Otherwise, just clean up and return NULL */ @@ -691,9 +692,8 @@ errorReply( int action) { DCB *client = NULL; - ROUTER_OBJECT *router = NULL; SESSION *session = backend_dcb->session; - client = backend_dcb->session->client; + client = session->client; ss_dassert(client != NULL); }