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

Merge branch 'release-1.0GA' into bug_679_fix

Browse Source
This commit is contained in:
Markus Makela
2015-01-02 20:57:28 +02:00
parent 95cd0b93cb a3d5367d55
commit b3d79f7273
8 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/filter/tee.c
View File

@ -736,12 +736,12 @@ char *ptr;
int length, rval, residual = 0;
GWBUF *clone = NULL;
if (my_session->branch_session && my_session->branch_session->state == SESSION_STATE_ROUTER_READY)
if (my_session->branch_session &&
my_session->branch_session->state == SESSION_STATE_ROUTER_READY)
{
if (my_session->residual)
{
clone = gwbuf_clone(queue);
clone = gwbuf_clone_all(queue);
if (my_session->residual < GWBUF_LENGTH(clone))
{
@ -763,18 +763,17 @@ GWBUF *clone = NULL;
{
char *dummy;
modutil_MySQL_Query(queue, &dummy, &length, &residual);
clone = gwbuf_clone(queue);
length = modutil_MySQL_query_len(queue, &residual);
clone = gwbuf_clone_all(queue);
my_session->residual = residual;
}
free(ptr);
}
else if (packet_is_required(queue))
{
clone = gwbuf_clone(queue);
clone = gwbuf_clone_all(queue);
}
}
}
/* Pass the query downstream */
my_session->replies = 0;
@ -795,7 +794,7 @@ GWBUF *clone = NULL;
my_session->active = 0;
LOGIF(LT, (skygw_log_write(
LOGFILE_TRACE,
"Closed tee filter session.")));
"Closed tee filter session.")));
gwbuf_free(clone);
}
}

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

@ -668,8 +668,8 @@ int gw_read_client_event(
"%lu [gw_read_client_event] session "
"creation failed. fd %d, "
"state = MYSQL_AUTH_FAILED.",
protocol->owner_dcb->fd,
pthread_self())));
pthread_self(),
protocol->owner_dcb->fd)));
/** Send ERR 1045 to client */
mysql_send_auth_error(

4
server/modules/protocol/mysql_common.c
View File

@ -1637,7 +1637,9 @@ mysql_send_auth_error (
* Buffer contains at least one of the following:
* complete [complete] [partial] mysql packet
*
* return pointer to gwbuf containing a complete packet or
* @param p_readbuf Address of read buffer pointer
*
* @return pointer to gwbuf containing a complete packet or
* NULL if no complete packet was found.
*/
GWBUF* gw_MySQL_get_next_packet(

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

@ -411,12 +411,12 @@ BACKEND *master_host = NULL;
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [newSession] Examine server in port %d with "
"%d connections. Status is %d, "
"%d connections. Status is %s, "
"inst->bitvalue is %d",
pthread_self(),
inst->servers[i]->server->port,
inst->servers[i]->current_connection_count,
inst->servers[i]->server->status,
STRSRVSTATUS(inst->servers[i]->server),
inst->bitmask)));
}
@ -972,7 +972,7 @@ static int handle_state_switch(DCB* dcb,DCB_REASON reason, void * routersession)
SESSION* session = dcb->session;
ROUTER_CLIENT_SES* rses = (ROUTER_CLIENT_SES*)routersession;
SERVICE* service = session->service;
ROUTER* router = service->router;
ROUTER* router = (ROUTER *)service->router;
switch(reason)
{