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

Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA

Browse Source
This commit is contained in:
VilhoRaatikka
2014-12-09 11:03:43 +02:00
parent b98a563f46 19cf44bd59
commit 968b67dd71
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/core/service.c
View File

@ -349,8 +349,15 @@ serviceStart(SERVICE *service)
SERV_PROTOCOL *port; SERV_PROTOCOL *port;
int listeners = 0; int listeners = 0;
service->router_instance = service->router->createInstance(service, if((service->router_instance = service->router->createInstance(service,
service->routerOptions); service->routerOptions)) == NULL)
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Failed to start router for service '%s'.",
service->name)));
return listeners;
}
port = service->ports; port = service->ports;
while (port) while (port)
@ -395,12 +402,21 @@ int
serviceStartAll() serviceStartAll()
{ {
SERVICE *ptr; SERVICE *ptr;
int n = 0; int n = 0,i;
ptr = allServices; ptr = allServices;
while (ptr) while (ptr)
{ {
n += serviceStart(ptr); n += (i = serviceStart(ptr));
if(i == 0)
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Failed to start service '%s'.",
ptr->name)));
}
ptr = ptr->next; ptr = ptr->next;
} }
return n; return n;

5
server/modules/protocol/mysql_client.c
View File

@ -144,7 +144,7 @@ GetModuleObject()
int int
mysql_send_ok(DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message) { mysql_send_ok(DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message) {
uint8_t *outbuf = NULL; uint8_t *outbuf = NULL;
uint8_t mysql_payload_size = 0; uint32_t mysql_payload_size = 0;
uint8_t mysql_packet_header[4]; uint8_t mysql_packet_header[4];
uint8_t *mysql_payload = NULL; uint8_t *mysql_payload = NULL;
uint8_t field_count = 0; uint8_t field_count = 0;
@ -223,7 +223,7 @@ int
MySQLSendHandshake(DCB* dcb) MySQLSendHandshake(DCB* dcb)
{ {
uint8_t *outbuf = NULL; uint8_t *outbuf = NULL;
uint8_t mysql_payload_size = 0; uint32_t mysql_payload_size = 0;
uint8_t mysql_packet_header[4]; uint8_t mysql_packet_header[4];
uint8_t mysql_packet_id = 0; uint8_t mysql_packet_id = 0;
uint8_t mysql_filler = GW_MYSQL_HANDSHAKE_FILLER; uint8_t mysql_filler = GW_MYSQL_HANDSHAKE_FILLER;
@ -283,7 +283,6 @@ MySQLSendHandshake(DCB* dcb)
// write packet heder with mysql_payload_size // write packet heder with mysql_payload_size
gw_mysql_set_byte3(mysql_packet_header, mysql_payload_size); gw_mysql_set_byte3(mysql_packet_header, mysql_payload_size);
//mysql_packet_header[0] = mysql_payload_size;
// write packent number, now is 0 // write packent number, now is 0
mysql_packet_header[3]= mysql_packet_id; mysql_packet_header[3]= mysql_packet_id;