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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-09-14 10:38:26 +03:00
parent 8c561c6e55 c600b8ab92
commit 4e41978069
8 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1413,6 +1413,7 @@ GWBUF* blr_read_binlog(ROUTER_INSTANCE* router,
*/
void blr_close_binlog(ROUTER_INSTANCE* router, BLFILE* file)
{
mxb_assert(file);
spinlock_acquire(&router->fileslock);
file->refcnt--;
if (file->refcnt == 0)
@ -4366,6 +4367,7 @@ bool blr_save_mariadb_gtid(ROUTER_INSTANCE* inst)
{
if (sql_ret == SQLITE_CONSTRAINT)
{
sqlite3_free(errmsg);
/* Prepare UPDATE SQL */
snprintf(sql_stmt,
GTID_SQL_BUFFER_SIZE,
@ -4413,6 +4415,8 @@ bool blr_save_mariadb_gtid(ROUTER_INSTANCE* inst)
}
}
sqlite3_free(errmsg);
MXS_DEBUG("Saved/udated MariaDB GTID '%s', %s:%lu,%lu, SQL [%s]",
gtid_info.gtid,
inst->binlog_name,