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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2017-11-27 09:10:33 +02:00
parent dc2286c774 a418804c83
commit a72956e2f3
22 changed files with 1272 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/routing/binlogrouter/blr.c
View File

@ -646,11 +646,6 @@ createInstance(SERVICE *service, char **options)
}
}
}
else
{
MXS_ERROR("%s: Error: No router options supplied for binlogrouter",
service->name);
}
inst->orig_masterid = 0;
inst->mariadb10_gtid_domain = BLR_DEFAULT_GTID_DOMAIN_ID;
@ -873,10 +868,10 @@ createInstance(SERVICE *service, char **options)
{
if (rc == -1)
{
MXS_ERROR("%s: master.ini file not found in %s."
" Master registration cannot be started."
" Configure with CHANGE MASTER TO ...",
inst->service->name, inst->binlogdir);
MXS_WARNING("%s: master.ini file not found in %s."
" Master registration cannot be started."
" Configure with CHANGE MASTER TO ...",
inst->service->name, inst->binlogdir);
}
else
{

1
server/modules/routing/binlogrouter/blr.h
View File

@ -532,6 +532,7 @@ typedef struct router_slave
char *mariadb_gtid; /*< MariaDB 10 Slave connects with GTID */
sqlite3 *gtid_maps; /*< GTID storage client handle, read only*/
MARIADB_GTID_INFO f_info; /*< GTID info for file name prefix */
bool annotate_rows; /*< MariaDB 10 Slave requests ANNOTATE_ROWS */
#if defined(SS_DEBUG)
skygw_chk_t rses_chk_tail;
#endif