From 1f77f37fbbb39a57246a419466e625bfb0bc98b5 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Thu, 26 Jun 2014 21:16:43 +0300 Subject: [PATCH 1/2] fix type in path in .spec --- maxscale.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maxscale.spec b/maxscale.spec index c3f72315e..077c48e55 100644 --- a/maxscale.spec +++ b/maxscale.spec @@ -43,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d/ mkdir -p $RPM_BUILD_ROOT%{install_path} cp -r binaries/* $RPM_BUILD_ROOT%{install_path} cp maxscale.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/ -cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ +cp etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ %clean @@ -51,6 +51,6 @@ cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ %defattr(-,root,root) %{install_path} /etc/ld.so.conf.d/maxscale.conf -/etc/inid.d/maxscale +/etc/init.d/maxscale %changelog From 52646a9942eee6cd947381595df243bec0d1ac46 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Thu, 26 Jun 2014 21:22:33 +0200 Subject: [PATCH 2/2] Fix compile warning Fix compile warning --- server/modules/routing/readconnroute.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c index c38d41199..5f9b5225d 100644 --- a/server/modules/routing/readconnroute.c +++ b/server/modules/routing/readconnroute.c @@ -110,13 +110,13 @@ static void clientReply( void *router_session, GWBUF *queue, DCB *backend_dcb); -static void handleError( - ROUTER *instance, - void *router_session, - GWBUF *errbuf, - DCB *backend_dcb, - int action, - bool *succp); +static void handleError( + ROUTER *instance, + void *router_session, + GWBUF *errbuf, + DCB *backend_dcb, + error_action_t action, + bool *succp); static uint8_t getCapabilities (ROUTER* inst, void* router_session); @@ -706,12 +706,12 @@ clientReply( */ static void handleError( - ROUTER *instance, - void *router_session, - GWBUF *errbuf, - DCB *backend_dcb, - int action, - bool *succp) + ROUTER *instance, + void *router_session, + GWBUF *errbuf, + DCB *backend_dcb, + error_action_t action, + bool *succp) { DCB *client = NULL; SESSION *session = backend_dcb->session;