Merge branch 'release-1.0beta' of https://github.com/skysql/MaxScale into release-1.0beta

Conflicts:
	server/modules/protocol/mysql_common.c
This commit is contained in:
VilhoRaatikka
2014-08-15 18:43:05 +03:00
11 changed files with 278 additions and 104 deletions

View File

@ -1548,8 +1548,10 @@ static void clientReply (
(uint8_t *)GWBUF_DATA((scur->scmd_cur_cmd->my_sescmd_buf));
size_t len = MYSQL_GET_PACKET_LEN(buf);
char* cmdstr = (char *)malloc(len+1);
/** data+termination character == len */
snprintf(cmdstr, len, "%s", &buf[5]);
snprintf(cmdstr, len+1, "%s", &buf[5]);
ss_dassert(len+4 == GWBUF_LENGTH(scur->scmd_cur_cmd->my_sescmd_buf));
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,