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

Merge branch 'develop' into 1.2.1-binlog_router_trx

Browse Source
This commit is contained in:
MassimilianoPinto
2015-09-28 08:48:27 +02:00
parent b6df52a68e df65ea0386
commit 69af0df6b5
9 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1808,8 +1808,8 @@ static int gw_error_client_event(
}
#if defined(SS_DEBUG)
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"Client error event handling.")));
#endif
dcb_close(dcb);
@ -1897,8 +1897,8 @@ gw_client_hangup_event(DCB *dcb)
goto retblock;
}
#if defined(SS_DEBUG)
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"Client hangup error handling.")));
#endif
dcb_close(dcb);

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

@ -2261,7 +2261,7 @@ char *create_auth_fail_str(
}
else if(errcode == MYSQL_FAILED_AUTH_SSL)
{
sprintf(errstr, ferrstr);
sprintf(errstr, "%s", ferrstr);
}
else
{