hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into MAX-111

Browse Source
This commit is contained in:
Mark Riddoch
2014-06-27 09:52:00 +01:00
parent 7cdef05710 52646a9942
commit c824e9fad6
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale.spec
View File

@ -43,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d/
mkdir -p $RPM_BUILD_ROOT%{install_path} mkdir -p $RPM_BUILD_ROOT%{install_path}
cp -r binaries/* $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 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 %clean
@ -51,6 +51,6 @@ cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/
%defattr(-,root,root) %defattr(-,root,root)
%{install_path} %{install_path}
/etc/ld.so.conf.d/maxscale.conf /etc/ld.so.conf.d/maxscale.conf
/etc/inid.d/maxscale /etc/init.d/maxscale
%changelog %changelog

26
server/modules/routing/readconnroute.c
View File

@ -110,13 +110,13 @@ static void clientReply(
void *router_session, void *router_session,
GWBUF *queue, GWBUF *queue,
DCB *backend_dcb); DCB *backend_dcb);
static void handleError( static void handleError(
ROUTER *instance, ROUTER *instance,
void *router_session, void *router_session,
GWBUF *errbuf, GWBUF *errbuf,
DCB *backend_dcb, DCB *backend_dcb,
int action, error_action_t action,
bool *succp); bool *succp);
static uint8_t getCapabilities (ROUTER* inst, void* router_session); static uint8_t getCapabilities (ROUTER* inst, void* router_session);
@ -706,12 +706,12 @@ clientReply(
*/ */
static void static void
handleError( handleError(
ROUTER *instance, ROUTER *instance,
void *router_session, void *router_session,
GWBUF *errbuf, GWBUF *errbuf,
DCB *backend_dcb, DCB *backend_dcb,
int action, error_action_t action,
bool *succp) bool *succp)
{ {
DCB *client = NULL; DCB *client = NULL;
SESSION *session = backend_dcb->session; SESSION *session = backend_dcb->session;