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

Merge branch 'develop' into MXS-329

Browse Source
This commit is contained in:
Markus Makela
2015-09-24 17:59:36 +03:00
parent 89667294b3 2f0ef4ad31
commit 2dfb9e3c11
24 changed files with 1937 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -45,6 +45,8 @@ MODULE_INFO info = {
# include <mysql_client_server_protocol.h>
#endif
#define RWSPLIT_TRACE_MSG_LEN 1000
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
@ -2249,7 +2251,7 @@ static bool route_single_stmt(
size_t len = MIN(GWBUF_LENGTH(querybuf),
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start)-1);
char* data = (char*)&packet[5];
char* contentstr = strndup(data, len);
char* contentstr = strndup(data, MIN(len, RWSPLIT_TRACE_MSG_LEN));
char* qtypestr = skygw_get_qtype_str(qtype);
skygw_log_write(
@ -4243,7 +4245,6 @@ static bool execute_sescmd_in_backend(
}
else
{
while((buf = GWBUF_CONSUME_ALL(buf)) != NULL);
succp = false;
}
return_succp: