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

Merge branch '2.0' into develop

Browse Source
This commit is contained in:
Markus Makela
2016-12-05 21:19:59 +02:00
parent f5eb4e21dc 1a9232b152
commit 4ae85dc754
18 changed files with 215 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/binlogrouter/blr_file.c
View File

@ -433,10 +433,10 @@ blr_write_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint32_t size,
router->binlog_name,
strerror_r(errno, err_msg, sizeof(err_msg)));
/* Remove any partial event that was written */
if (ftruncate(router->binlog_fd, router->last_written))
if (ftruncate(router->binlog_fd, router->binlog_position))
{
MXS_ERROR("%s: Failed to truncate binlog record at %lu of %s, %s. ",
router->service->name, router->last_written,
router->service->name, router->binlog_position,
router->binlog_name,
strerror_r(errno, err_msg, sizeof(err_msg)));
}