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

MXS-2555 uncrustify mysql_common.cc, and a minor bug fix in smartrouter.cc

Browse Source
This commit is contained in:
Niclas Antti
2019-06-16 13:08:16 +03:00
parent 6a7b6d4b89
commit 56e5c417c1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1479,8 +1479,8 @@ void mxs_mysql_parse_ok_packet(GWBUF* buff, size_t packet_offset, size_t packet_
gwbuf_copy_data(buff, packet_offset, packet_len, local_buf); gwbuf_copy_data(buff, packet_offset, packet_len, local_buf);
ptr += (MYSQL_HEADER_LEN + 1); // Header and Command type ptr += (MYSQL_HEADER_LEN + 1); // Header and Command type
mxq::leint_consume(&ptr); // Affected rows mxq::leint_consume(&ptr); // Affected rows
mxq::leint_consume(&ptr); // Last insert-id mxq::leint_consume(&ptr); // Last insert-id
uint16_t server_status = gw_mysql_get_byte2(ptr); uint16_t server_status = gw_mysql_get_byte2(ptr);
ptr += 2; // status ptr += 2; // status
ptr += 2; // number of warnings ptr += 2; // number of warnings
@ -1488,11 +1488,11 @@ void mxs_mysql_parse_ok_packet(GWBUF* buff, size_t packet_offset, size_t packet_
if (ptr < (local_buf + packet_len)) if (ptr < (local_buf + packet_len))
{ {
size_t size; size_t size;
mxq::lestr_consume(&ptr, &size); // info mxq::lestr_consume(&ptr, &size); // info
if (server_status & SERVER_SESSION_STATE_CHANGED) if (server_status & SERVER_SESSION_STATE_CHANGED)
{ {
MXB_AT_DEBUG(uint64_t data_size = ) mxq::leint_consume(&ptr); // total MXB_AT_DEBUG(uint64_t data_size = ) mxq::leint_consume(&ptr); // total
// SERVER_SESSION_STATE_CHANGED // SERVER_SESSION_STATE_CHANGED
// length // length
mxb_assert(data_size == packet_len - (ptr - local_buf)); mxb_assert(data_size == packet_len - (ptr - local_buf));
@ -1507,27 +1507,27 @@ void mxs_mysql_parse_ok_packet(GWBUF* buff, size_t packet_offset, size_t packet_
{ {
case SESSION_TRACK_STATE_CHANGE: case SESSION_TRACK_STATE_CHANGE:
case SESSION_TRACK_SCHEMA: case SESSION_TRACK_SCHEMA:
size = mxq::leint_consume(&ptr); // Length of the overall entity. size = mxq::leint_consume(&ptr); // Length of the overall entity.
ptr += size; ptr += size;
break; break;
case SESSION_TRACK_GTIDS: case SESSION_TRACK_GTIDS:
mxq::leint_consume(&ptr); // Length of the overall entity. mxq::leint_consume(&ptr); // Length of the overall entity.
mxq::leint_consume(&ptr); // encoding specification mxq::leint_consume(&ptr); // encoding specification
var_value = mxq::lestr_consume_dup(&ptr); var_value = mxq::lestr_consume_dup(&ptr);
gwbuf_add_property(buff, MXS_LAST_GTID, var_value); gwbuf_add_property(buff, MXS_LAST_GTID, var_value);
MXS_FREE(var_value); MXS_FREE(var_value);
break; break;
case SESSION_TRACK_TRANSACTION_CHARACTERISTICS: case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
mxq::leint_consume(&ptr); // length mxq::leint_consume(&ptr); // length
var_value = mxq::lestr_consume_dup(&ptr); var_value = mxq::lestr_consume_dup(&ptr);
gwbuf_add_property(buff, "trx_characteristics", var_value); gwbuf_add_property(buff, "trx_characteristics", var_value);
MXS_FREE(var_value); MXS_FREE(var_value);
break; break;
case SESSION_TRACK_SYSTEM_VARIABLES: case SESSION_TRACK_SYSTEM_VARIABLES:
mxq::leint_consume(&ptr); // lenth mxq::leint_consume(&ptr); // lenth
// system variables like autocommit, schema, charset ... // system variables like autocommit, schema, charset ...
var_name = mxq::lestr_consume_dup(&ptr); var_name = mxq::lestr_consume_dup(&ptr);
var_value = mxq::lestr_consume_dup(&ptr); var_value = mxq::lestr_consume_dup(&ptr);
@ -1538,7 +1538,7 @@ void mxs_mysql_parse_ok_packet(GWBUF* buff, size_t packet_offset, size_t packet_
break; break;
case SESSION_TRACK_TRANSACTION_TYPE: case SESSION_TRACK_TRANSACTION_TYPE:
mxq::leint_consume(&ptr); // length mxq::leint_consume(&ptr); // length
trx_info = mxq::lestr_consume_dup(&ptr); trx_info = mxq::lestr_consume_dup(&ptr);
MXS_DEBUG("get trx_info:%s", trx_info); MXS_DEBUG("get trx_info:%s", trx_info);
gwbuf_add_property(buff, (char*)"trx_state", trx_info); gwbuf_add_property(buff, (char*)"trx_state", trx_info);

2
server/modules/routing/smartrouter/smartrouter.cc
View File

@ -104,7 +104,7 @@ bool SmartRouter::Config::post_configure(const MXS_CONFIG_PARAMETER& params)
if (pServer->address[0] != '/') if (pServer->address[0] != '/')
{ {
if (strcmp(pServer->address, "127.0.0.1") == 0 || strcmp(pServer->address, "localhost")) if (strcmp(pServer->address, "127.0.0.1") == 0 || strcmp(pServer->address, "localhost") == 0)
{ {
MXS_WARNING("The server %s, used by the smartrouter %s, is currently accessed " MXS_WARNING("The server %s, used by the smartrouter %s, is currently accessed "
"using a TCP/IP socket (%s:%d). For better performance, a Unix " "using a TCP/IP socket (%s:%d). For better performance, a Unix "