Merge branch 'develop' into binlog_server_waitdata_encryption

2016-12-06 14:57:06 +01:00
parent b2e8a2d8c5 9731bca42e
commit 76a2475c33
19 changed files with 216 additions and 56 deletions
--- a/server/modules/routing/binlogrouter/blr_file.c
+++ b/server/modules/routing/binlogrouter/blr_file.c
@ -565,7 +565,7 @@ blr_write_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint32_t size,
        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)));
        }