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

Fixed compile errors

Browse Source 
Fixed compile errors
This commit is contained in:
MassimilianoPinto
2015-08-04 14:19:53 +02:00
parent 61c47375d5
commit 28da5f2470
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ static void stats_func(void *);
static bool rses_begin_locked_router_action(ROUTER_SLAVE *); static bool rses_begin_locked_router_action(ROUTER_SLAVE *);
static void rses_end_locked_router_action(ROUTER_SLAVE *); static void rses_end_locked_router_action(ROUTER_SLAVE *);
void my_uuid_init(ulong seed1, ulong seed2); void my_uuid_init(ulong seed1, ulong seed2);
void my_uuid(char *guid); void my_uuid(unsigned char *guid);
GWBUF *blr_cache_read_response(ROUTER_INSTANCE *router, char *response); GWBUF *blr_cache_read_response(ROUTER_INSTANCE *router, char *response);
static SPINLOCK instlock; static SPINLOCK instlock;
@ -189,7 +189,6 @@ char path[PATH_MAX+1] = "";
char filename[PATH_MAX+1] = ""; char filename[PATH_MAX+1] = "";
int master_info = 0; int master_info = 0;
int rc = 0; int rc = 0;
char *defuuid;
if(service->credentials.name == NULL || if(service->credentials.name == NULL ||
service->credentials.authdata == NULL) service->credentials.authdata == NULL)
@ -266,7 +265,7 @@ char *defuuid;
inst->m_errmsg = NULL; inst->m_errmsg = NULL;
my_uuid_init((ulong)rand()*12345,12345); my_uuid_init((ulong)rand()*12345,12345);
if ((defuuid = (char *)malloc(20)) != NULL) if ((defuuid = (unsigned char *)malloc(20)) != NULL)
{ {
my_uuid(defuuid); my_uuid(defuuid);
if ((inst->uuid = (char *)malloc(38)) != NULL) if ((inst->uuid = (char *)malloc(38)) != NULL)

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

@ -78,7 +78,7 @@ extern void blr_file_use_binlog(ROUTER_INSTANCE *router, char *file);
extern int blr_file_new_binlog(ROUTER_INSTANCE *router, char *file); extern int blr_file_new_binlog(ROUTER_INSTANCE *router, char *file);
extern int blr_file_write_master_config(ROUTER_INSTANCE *router, char *error); extern int blr_file_write_master_config(ROUTER_INSTANCE *router, char *error);
int blr_file_get_next_binlogname(ROUTER_INSTANCE *router); int blr_file_get_next_binlogname(ROUTER_INSTANCE *router);
static uint32_t extract_field(uint8_t *src, int bits); uint32_t extract_field(uint8_t *src, int bits);
static void encode_value(unsigned char *data, unsigned int value, int len); static void encode_value(unsigned char *data, unsigned int value, int len);
static int blr_slave_query(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue); static int blr_slave_query(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue);
static int blr_slave_replay(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *master); static int blr_slave_replay(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *master);