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

Fix binlogrouter build failure

Browse Source 
The binlogrouter used the wrong variable name.
This commit is contained in:
Markus Makela 2016-12-08 10:11:55 +02:00
parent d42ef8ed13
commit d9ced5bbab
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -2948,7 +2948,6 @@ blr_slave_send_fde(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *fde)
GWBUF *head; GWBUF *head;
uint8_t *ptr; uint8_t *ptr;
uint32_t chksum; uint32_t chksum;
char err_msg[BINLOG_ERROR_MSG_LEN + 1];
uint32_t event_size; uint32_t event_size;
uint8_t *event_ptr; uint8_t *event_ptr;
@ -2957,7 +2956,6 @@ blr_slave_send_fde(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *fde)
return 0; return 0;
} }
err_msg[BINLOG_ERROR_MSG_LEN] = '\0';
event_ptr = GWBUF_DATA(fde); event_ptr = GWBUF_DATA(fde);
head = gwbuf_alloc(5); head = gwbuf_alloc(5);
ptr = GWBUF_DATA(head); ptr = GWBUF_DATA(head);
@ -5887,7 +5885,6 @@ blr_slave_read_ste(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, uint32_t fde_en
if (hdr.event_type == MARIADB10_START_ENCRYPTION_EVENT) if (hdr.event_type == MARIADB10_START_ENCRYPTION_EVENT)
{ {
uint8_t *record_ptr = GWBUF_DATA(record); uint8_t *record_ptr = GWBUF_DATA(record);
void *old_encryption_ctx = slave->encryption_ctx;
SLAVE_ENCRYPTION_CTX *new_encryption_ctx = MXS_CALLOC(1, sizeof(SLAVE_ENCRYPTION_CTX)); SLAVE_ENCRYPTION_CTX *new_encryption_ctx = MXS_CALLOC(1, sizeof(SLAVE_ENCRYPTION_CTX));
if (!new_encryption_ctx) if (!new_encryption_ctx)
@ -5904,13 +5901,14 @@ blr_slave_read_ste(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, uint32_t fde_en
spinlock_acquire(&slave->catch_lock); spinlock_acquire(&slave->catch_lock);
SLAVE_ENCRYPTION_CTX *old_encryption_ctx = slave->encryption_ctx;
/* Set the new encryption ctx into slave */ /* Set the new encryption ctx into slave */
slave->encryption_ctx = new_encryption_ctx; slave->encryption_ctx = new_encryption_ctx;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
/* Free previous encryption ctx */ /* Free previous encryption ctx */
MXS_FREE(old->encryption_ctx); MXS_FREE(old_encryption_ctx);
MXS_INFO("Start Encryption event found. Binlog %s is encrypted. First event at %lu", MXS_INFO("Start Encryption event found. Binlog %s is encrypted. First event at %lu",
slave->binlogfile, slave->binlogfile,