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

Z2 update

Browse Source
This commit is contained in:
MassimilianoPinto
2014-07-29 16:49:03 +02:00
parent 20bda47f64 b68dc5ff2a
commit 8d19d339c5
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/include/server.h
View File

@ -100,7 +100,7 @@ typedef struct server {
#define SERVER_SLAVE 0x0004 /**<< The server is a slave, i.e. can handle reads */ #define SERVER_SLAVE 0x0004 /**<< The server is a slave, i.e. can handle reads */
#define SERVER_JOINED 0x0008 /**<< The server is joined in a Galera cluster */ #define SERVER_JOINED 0x0008 /**<< The server is joined in a Galera cluster */
#define SERVER_MAINT 0x1000 /**<< Server is in maintenance mode */ #define SERVER_MAINT 0x1000 /**<< Server is in maintenance mode */
#define SERVER_SLAVE_OF_EXTERNAL_MASTER 0x0016 /**<< Server is slave of a Master outside the provided replication topology */ #define SERVER_SLAVE_OF_EXTERNAL_MASTER 0x0080 /**<< Server is slave of a Master outside the provided replication topology */
/** /**
* Is the server running - the macro returns true if the server is marked as running * Is the server running - the macro returns true if the server is marked as running

5
server/modules/protocol/mysql_backend.c
View File

@ -502,7 +502,10 @@ static int gw_read_backend_event(DCB *dcb) {
goto return_rc; goto return_rc;
} }
} }
/** If protocol has command set it is session command */ /**
* If protocol has session command set, concatenate whole
* response into one buffer.
*/
if (protocol_get_srv_command((MySQLProtocol *)dcb->protocol, false) != if (protocol_get_srv_command((MySQLProtocol *)dcb->protocol, false) !=
MYSQL_COM_UNDEFINED) MYSQL_COM_UNDEFINED)
{ {

2
server/test/makefile
View File

@ -10,7 +10,7 @@ include ../../test.inc
TEST_ROOT := $(ROOT_PATH)/test TEST_ROOT := $(ROOT_PATH)/test
PARENT_DIR := $(ROOT_PATH)/server PARENT_DIR := $(ROOT_PATH)/server
CUR_DIR := $(PARENT_DIR)/test CUR_DIR := $(PARENT_DIR)/test
export MAXSCALE_HOME=$(CUR_DIR)/MaxScale export MAXSCALE_HOME=$(CUR_DIR)
CC=cc CC=cc
TESTLOG := $(CUR_DIR)/testserver.log TESTLOG := $(CUR_DIR)/testserver.log