aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes crash on shutdown when connection is null

Browse Source
pull/1525/head
Nick Vyzas 8 years ago
parent 87723ed215
commit a1a7997bdc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File

16
lib/MySQL_Session.cpp
Unescape View File

@ -2989,8 +2989,12 @@ handler_again:
case PROCESSING_STMT_PREPARE:
{
char sqlstate[10];
sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
if (myconn->mysql) {
sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
} else {
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1, 2013, (char *)"" ,(char *)"Lost connection to MySQL server during query");
}
client_myds->pkt_sid++;
if (previous_status.size()) {
// an STMT_PREPARE failed
@ -3004,8 +3008,12 @@ handler_again:
case PROCESSING_STMT_EXECUTE:
{
char sqlstate[10];
sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
if (myconn->mysql) {
sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
} else {
client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1, 2013, (char *)"" ,(char *)"Lost connection to MySQL server during query");
}
client_myds->pkt_sid++;
}
break;

Write Preview
Loading…
Cancel
Save