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

Update to support servers that do not support GTID

Browse Source
This commit is contained in:
Mark Riddoch
2015-02-04 13:10:46 +00:00
parent 917ad466e3
commit 8ddb2fa732
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,6 +314,7 @@ char query[128];
"Invalid master state machine state (%d) for binlog router.", "Invalid master state machine state (%d) for binlog router.",
router->master_state))); router->master_state)));
gwbuf_consume(buf, gwbuf_length(buf)); gwbuf_consume(buf, gwbuf_length(buf));
spinlock_acquire(&router->lock); spinlock_acquire(&router->lock);
if (router->reconnect_pending) if (router->reconnect_pending)
{ {
@ -335,7 +336,20 @@ char query[128];
return; return;
} }
if (router->master_state != BLRM_BINLOGDUMP && MYSQL_RESPONSE_ERR(buf)) if (router->master_state == BLRM_GTIDMODE && MYSQL_RESPONSE_ERR(buf))
{
/*
* If we get an error response to the GTID Mode then we
* asusme the server does not support GTID modes and
* continue. The error is saved and replayed to slaves if
* they also request the GTID mode.
*/
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"%s: Master server does not support GTID Mode.",
router->service->name)));
}
else if (router->master_state != BLRM_BINLOGDUMP && MYSQL_RESPONSE_ERR(buf))
{ {
LOGIF(LE, (skygw_log_write( LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,