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

Fixed events larger than 2^24 failing without transaction safety

Browse Source 
If transaction safety was disabled and a large event sent in multiple SQL
packets was received, the distribution of that event to the slaves would fail.
This commit is contained in:
Markus Makela 2016-02-12 10:17:50 +02:00
parent 2b7e2d3043
commit 74c8b5e296
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/routing/binlog/blr_master.c
View File

@ -1344,13 +1344,25 @@ uint32_t partialpos = 0;
if (router->trx_safe == 0 || (router->trx_safe && router->pending_transaction == 0)) {
uint64_t old_pos = router->binlog_position;
router->binlog_position = router->current_pos;
router->current_safe_event = router->current_pos;
spinlock_release(&router->binlog_lock);
/* Now distribute events */
blr_distribute_binlog_record(router, &hdr, ptr);
if (router->master_event_state == BLR_EVENT_COMPLETE)
{
/** Read the complete event from the disk */
GWBUF *record = blr_read_events_from_pos(router, old_pos, &hdr, hdr.next_pos);
uint8_t *data = GWBUF_DATA(record);
blr_distribute_binlog_record(router, &hdr, data);
gwbuf_free(record);
}
else
{
/* Now distribute events */
blr_distribute_binlog_record(router, &hdr, ptr);
}
} else {
/**
* If transaction is closed: