From d83a4673d77eb1c2909d988f8f28657985c2edb6 Mon Sep 17 00:00:00 2001 From: VilhoRaatikka Date: Tue, 29 Jul 2014 12:11:00 +0300 Subject: [PATCH] Bug 462, http://bugs.skysql.com/show_bug.cgi?id=462, testall target fails in server/test to invalid MAXSCALE_HOME path specification. Fixed path specification in server/test/makefile. Added comments to mysql_backend.c --- server/modules/protocol/mysql_backend.c | 5 ++++- server/test/makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c index 6c101204e..43cd97bcd 100644 --- a/server/modules/protocol/mysql_backend.c +++ b/server/modules/protocol/mysql_backend.c @@ -502,7 +502,10 @@ static int gw_read_backend_event(DCB *dcb) { 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) != MYSQL_COM_UNDEFINED) { diff --git a/server/test/makefile b/server/test/makefile index d812494fc..7f9c36b84 100644 --- a/server/test/makefile +++ b/server/test/makefile @@ -10,7 +10,7 @@ include ../../test.inc TEST_ROOT := $(ROOT_PATH)/test PARENT_DIR := $(ROOT_PATH)/server CUR_DIR := $(PARENT_DIR)/test -export MAXSCALE_HOME=$(CUR_DIR)/MaxScale +export MAXSCALE_HOME=$(CUR_DIR) CC=cc TESTLOG := $(CUR_DIR)/testserver.log