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

Added blr_cache_read_master_data and dcb checks

Browse Source 
Added blr_cache_read_master_data()
Added dcb checks before calling db_close
Forced initialisation values of some parameters
This commit is contained in:
MassimilianoPinto
2015-06-08 16:56:52 +02:00
parent 945e2f8132
commit 809cdb5b1e
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2211,8 +2211,9 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
if (router->master_state != BLRM_SLAVE_STOPPED) {
if (router->master->fd != -1 && router->master->state == DCB_STATE_POLLING)
blr_master_close(router);
if (router->master)
if (router->master->fd != -1 && router->master->state == DCB_STATE_POLLING)
blr_master_close(router);
spinlock_acquire(&router->lock);
@ -2220,8 +2221,9 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
spinlock_release(&router->lock);
if (router->client->fd != -1 && router->client->state == DCB_STATE_POLLING)
dcb_close(router->client);
if (router->client)
if (router->client->fd != -1 && router->client->state == DCB_STATE_POLLING)
dcb_close(router->client);
/* Discard the queued residual data */
ptr = router->residual;