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

Added variables for MariaDB 10 compatibility.

Browse Source
This commit is contained in:
Markus Makela
2015-05-07 12:56:58 +03:00
parent 5c7b2a68e5
commit bc7cc2a466
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/binlog/blr.c
View File

@ -195,6 +195,7 @@ unsigned char *defuuid;
inst->retry_backoff = 1;
inst->binlogdir = NULL;
inst->heartbeat = 300; // Default is every 5 minutes
inst->mariadb10_compat = false;
inst->user = strdup(service->credentials.name);
inst->password = strdup(service->credentials.authdata);
@ -282,6 +283,10 @@ unsigned char *defuuid;
{
inst->masterid = atoi(value);
}
else if (strcmp(options[i], "mariadb10-compatibility") == 0)
{
inst->mariadb10_compat = config_truth_value(value);
}
else if (strcmp(options[i], "filestem") == 0)
{
inst->fileroot = strdup(value);

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

@ -449,7 +449,7 @@ char query[128];
router->saved_master.chksum2 = buf;
blr_cache_response(router, "chksum2", buf);
//buf = blr_make_query("SELECT @@GLOBAL.GTID_MODE");
buf = blr_make_query("SET @mariadb_slave_capability=4);
buf = blr_make_query("SET @mariadb_slave_capability=4");
router->master_state = BLRM_GTIDMODE;
router->master->func.write(router->master, buf);
break;