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

Removed extra ; in soem blr_make_query calls - this breaks parsing when

Browse Source 
one maxscale is chained from another
This commit is contained in:
Mark Riddoch
2015-02-20 16:07:09 +00:00
parent 77a25c5848
commit 22255a6045
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,7 @@ char query[128];
GWBUF_CONSUME_ALL(router->saved_master.select1); GWBUF_CONSUME_ALL(router->saved_master.select1);
router->saved_master.select1 = buf; router->saved_master.select1 = buf;
blr_cache_response(router, "select1", buf); blr_cache_response(router, "select1", buf);
buf = blr_make_query("SELECT VERSION();"); buf = blr_make_query("SELECT VERSION()");
router->master_state = BLRM_SELECTVER; router->master_state = BLRM_SELECTVER;
router->master->func.write(router->master, buf); router->master->func.write(router->master, buf);
break; break;
@ -521,7 +521,7 @@ char query[128];
GWBUF_CONSUME_ALL(router->saved_master.selectver); GWBUF_CONSUME_ALL(router->saved_master.selectver);
router->saved_master.selectver = buf; router->saved_master.selectver = buf;
blr_cache_response(router, "selectver", buf); blr_cache_response(router, "selectver", buf);
buf = blr_make_query("SELECT @@version_comment limit 1;"); buf = blr_make_query("SELECT @@version_comment limit 1");
router->master_state = BLRM_SELECTVERCOM; router->master_state = BLRM_SELECTVERCOM;
router->master->func.write(router->master, buf); router->master->func.write(router->master, buf);
break; break;
@ -531,7 +531,7 @@ char query[128];
GWBUF_CONSUME_ALL(router->saved_master.selectvercom); GWBUF_CONSUME_ALL(router->saved_master.selectvercom);
router->saved_master.selectvercom = buf; router->saved_master.selectvercom = buf;
blr_cache_response(router, "selectvercom", buf); blr_cache_response(router, "selectvercom", buf);
buf = blr_make_query("SELECT @@hostname;"); buf = blr_make_query("SELECT @@hostname");
router->master_state = BLRM_SELECTHOSTNAME; router->master_state = BLRM_SELECTHOSTNAME;
router->master->func.write(router->master, buf); router->master->func.write(router->master, buf);
break; break;
@ -541,7 +541,7 @@ char query[128];
GWBUF_CONSUME_ALL(router->saved_master.selecthostname); GWBUF_CONSUME_ALL(router->saved_master.selecthostname);
router->saved_master.selecthostname = buf; router->saved_master.selecthostname = buf;
blr_cache_response(router, "selecthostname", buf); blr_cache_response(router, "selecthostname", buf);
buf = blr_make_query("SELECT @@max_allowed_packet;"); buf = blr_make_query("SELECT @@max_allowed_packet");
router->master_state = BLRM_MAP; router->master_state = BLRM_MAP;
router->master->func.write(router->master, buf); router->master->func.write(router->master, buf);
break; break;