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

Fixed compiler warnings.

Browse Source
This commit is contained in:
Markus Makela
2015-09-12 04:46:47 +03:00
parent 3b0b740e47
commit bb72b0c892
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/binlog/blr_file.c
View File

@ -764,7 +764,6 @@ uint8_t *ptr;
int len; int len;
int var_block_len; int var_block_len;
int statement_len; int statement_len;
int checksum_len=0;
int found_chksum = 0; int found_chksum = 0;
int event_error = 0; int event_error = 0;
unsigned long transaction_events = 0; unsigned long transaction_events = 0;
@ -1139,7 +1138,6 @@ double average_bytes = 0;
check_alg, check_alg,
check_alg == 1 ? "BINLOG_CHECKSUM_ALG_CRC32" : "NONE or UNDEF"))); check_alg == 1 ? "BINLOG_CHECKSUM_ALG_CRC32" : "NONE or UNDEF")));
if (check_alg == 1) { if (check_alg == 1) {
checksum_len = 4;
found_chksum = 1; found_chksum = 1;
} else { } else {
found_chksum = 0; found_chksum = 0;
@ -1225,8 +1223,6 @@ double average_bytes = 0;
var_block_len = ptr[4 + 4 + 1 + 2]; var_block_len = ptr[4 + 4 + 1 + 2];
statement_len = hdr.event_size - 19 - (4+4+1+2+2+var_block_len+1+db_name_len); statement_len = hdr.event_size - 19 - (4+4+1+2+2+var_block_len+1+db_name_len);
//if (checksum_len)
// statement_len -= checksum_len;
statement_sql = calloc(1, statement_len+1); statement_sql = calloc(1, statement_len+1);
strncpy(statement_sql, (char *)ptr+4+4+1+2+2+var_block_len+1+db_name_len, statement_len); strncpy(statement_sql, (char *)ptr+4+4+1+2+2+var_block_len+1+db_name_len, statement_len);
@ -1271,8 +1267,8 @@ double average_bytes = 0;
if(hdr.event_type == XID_EVENT) { if(hdr.event_type == XID_EVENT) {
/* Commit received for a transactional tables, i.e. InnoDB */ /* Commit received for a transactional tables, i.e. InnoDB */
uint64_t xid; unsigned long long xid = (unsigned long long)extract_field(ptr, 64);
xid = extract_field(ptr, 64); skygw_log_write(LD, "XID_EVENT: %llu", xid);
if (pending_transaction > 0) { if (pending_transaction > 0) {
pending_transaction = 2; pending_transaction = 2;