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

Completed merge, fixed print delay to simple one.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-06-07 01:05:12 +03:00
parent ad744962b2
commit 916b763685
2 changed files with 5 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/mysql_client.c
View File

@ -795,7 +795,6 @@ int gw_read_client_event(DCB* dcb) {
/** Route COM_QUIT to backend */
if (mysql_command == '\x01') {
<<<<<<< HEAD
#if defined(ERRHANDLE)
/**
* Close router session and that closes
@ -806,9 +805,6 @@ int gw_read_client_event(DCB* dcb) {
#else
SESSION_ROUTE_QUERY(session, read_buffer);
// router->routeQuery(router_instance, rsession, read_buffer);
=======
SESSION_ROUTE_QUERY(session, read_buffer);
>>>>>>> develop
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"%lu [gw_read_client_event] Routed COM_QUIT to "