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

Fix compile errors and warnings

Browse Source 
Fix compile errors and warnings
This commit is contained in:
MassimilianoPinto
2014-06-26 18:20:33 +02:00
parent 8808fd7e47
commit f246219beb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/monitor/mysql_mon.c
View File

@ -494,7 +494,7 @@ static int conn_err_count;
if (isslave) if (isslave)
{ {
server_set_status(database->server, SERVER_SLAVE); server_set_status(database->server, SERVER_SLAVE);
/* Avoid any possible stale Master state /* Avoid any possible stale Master state */
server_clear_status(database->server, SERVER_MASTER); server_clear_status(database->server, SERVER_MASTER);
} else { } else {
/* Avoid any possible Master/Slave stale state */ /* Avoid any possible Master/Slave stale state */
@ -516,7 +516,6 @@ MYSQL_MONITOR *handle = (MYSQL_MONITOR *)arg;
MONITOR_SERVERS *ptr; MONITOR_SERVERS *ptr;
int replication_heartbeat = handle->replicationHeartbeat; int replication_heartbeat = handle->replicationHeartbeat;
int num_servers=0; int num_servers=0;
int depth_level = 0;
MONITOR_SERVERS *root_master; MONITOR_SERVERS *root_master;
if (mysql_thread_init()) if (mysql_thread_init())

3
server/modules/routing/readconnroute.c
View File

@ -140,6 +140,9 @@ static bool rses_begin_locked_router_action(
static void rses_end_locked_router_action( static void rses_end_locked_router_action(
ROUTER_CLIENT_SES* rses); ROUTER_CLIENT_SES* rses);
static BACKEND *get_root_master(
BACKEND **servers);
static SPINLOCK instlock; static SPINLOCK instlock;
static ROUTER_INSTANCE *instances; static ROUTER_INSTANCE *instances;

6
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -624,7 +624,7 @@ static void* newSession(
/** Copy backend pointers to router session. */ /** Copy backend pointers to router session. */
client_rses->rses_master_ref = master_ref; client_rses->rses_master_ref = master_ref;
/* assert with master_host */ /* assert with master_host */
ss_dassert(master_host && ((*p_master_ref)->bref_backend->backend_server == master_host->backend_server) && SERVER_MASTER); ss_dassert(master_ref && (master_ref->bref_backend->backend_server && SERVER_MASTER));
client_rses->rses_backend_ref = backend_ref; client_rses->rses_backend_ref = backend_ref;
client_rses->rses_nbackends = router_nservers; /*< # of backend servers */ client_rses->rses_nbackends = router_nservers; /*< # of backend servers */
client_rses->rses_capabilities = RCAP_TYPE_STMT_INPUT; client_rses->rses_capabilities = RCAP_TYPE_STMT_INPUT;
@ -850,8 +850,8 @@ static bool get_dcb(
ss_dassert(backend_ref->bref_dcb->state != DCB_STATE_ZOMBIE); ss_dassert(backend_ref->bref_dcb->state != DCB_STATE_ZOMBIE);
ss_dassert( ss_dassert(
(master_host && (b->backend_server == master_host->backend_server)) && (master_host && (backend_ref->bref_backend->backend_server == master_host->backend_server)) &&
smallest_nconn == -1); smallest_nconn == -1);
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,