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

misc fix and remove all tail spaces

Browse Source
This commit is contained in:
Dapeng Huang
2018-01-22 22:00:27 +08:00
parent 1729d73b19
commit 73e5fd52fa
3 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/protocol/mysql.h
View File

@ -353,7 +353,7 @@ typedef struct
int ignore_replies; /*< How many replies should be discarded */ int ignore_replies; /*< How many replies should be discarded */
GWBUF* stored_query; /*< Temporarily stored queries */ GWBUF* stored_query; /*< Temporarily stored queries */
bool collect_result; /*< Collect the next result set as one buffer */ bool collect_result; /*< Collect the next result set as one buffer */
uint32_t num_eof_packets; /*< Signal number to indicate is current packet is ok packet*/ uint32_t num_eof_packets; /*< Encountered eof packet number, used for check packet type */
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
skygw_chk_t protocol_chk_tail; skygw_chk_t protocol_chk_tail;
#endif #endif

4
server/modules/protocol/MySQL/mysql_common.cc
View File

@ -1851,7 +1851,7 @@ void mxs_mysql_get_session_track_info(GWBUF *buff, MySQLProtocol *proto)
{ {
size_t offset = 0; size_t offset = 0;
uint8_t header_and_command[MYSQL_HEADER_LEN+1]; uint8_t header_and_command[MYSQL_HEADER_LEN+1];
if (proto->server_capabilities & GW_MYSQL_CAPABILITIES_SESSION_TRACK) if (proto->server_capabilities&GW_MYSQL_CAPABILITIES_SESSION_TRACK)
{ {
while (gwbuf_copy_data(buff, offset, MYSQL_HEADER_LEN+1, header_and_command) == (MYSQL_HEADER_LEN+1)) while (gwbuf_copy_data(buff, offset, MYSQL_HEADER_LEN+1, header_and_command) == (MYSQL_HEADER_LEN+1))
{ {
@ -1863,7 +1863,7 @@ void mxs_mysql_get_session_track_info(GWBUF *buff, MySQLProtocol *proto)
(proto->num_eof_packets % 2) == 0) (proto->num_eof_packets % 2) == 0)
{ {
buff->gwbuf_type |= GWBUF_TYPE_REPLY_OK; buff->gwbuf_type |= GWBUF_TYPE_REPLY_OK;
mxs_mysql_parse_ok_packet(buff, offset, packet_len); mxs_mysql_parse_ok_packet(buff, offset, packet_len + MYSQL_HEADER_LEN);
} }
if ((proto->current_command == MXS_COM_QUERY || if ((proto->current_command == MXS_COM_QUERY ||