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

mariadb10 compatibility test without GTID

Browse Source 
First implementation of mariadb10 compatibility test without GTID

State machine to be modified for mysql5.6/mariadb10 compatibility
router options for mariadb10 slave registration still missing
This commit is contained in:
MassimilianoPinto
2015-05-06 12:19:18 +02:00
parent 9b4e835434
commit 5c7b2a68e5
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/include/blr.h
View File

@ -395,7 +395,7 @@ static char *blrs_states[] = { "Created", "Unregistered", "Registered",
#define ANONYMOUS_GTID_EVENT 0x22 #define ANONYMOUS_GTID_EVENT 0x22
#define PREVIOUS_GTIDS_EVENT 0x23 #define PREVIOUS_GTIDS_EVENT 0x23
#define MAX_EVENT_TYPE 0x23 #define MAX_EVENT_TYPE 0xa3
/** /**
* Binlog event flags * Binlog event flags

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

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

3
server/modules/routing/binlog/blr_slave.c
View File

@ -369,7 +369,8 @@ int query_len;
else if (strcasecmp(word, "@mariadb_slave_capability") == 0) else if (strcasecmp(word, "@mariadb_slave_capability") == 0)
{ {
free(query_text); free(query_text);
return blr_slave_send_ok(router, slave); return blr_slave_replay(router, slave, router->saved_master.gtid_mode);
//return blr_slave_send_ok(router, slave);
} }
else if (strcasecmp(word, "@master_binlog_checksum") == 0) else if (strcasecmp(word, "@master_binlog_checksum") == 0)
{ {