test/drogon
1
0
Fork 0
mirror of https://gitee.com/an-tao/drogon.git synced 2024-12-02 03:38:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix a bug when losting connection to MySQL server during query (#550)

Browse Source
This commit is contained in:
An Tao 2020-08-25 23:35:07 +08:00 committed by GitHub
parent 7117d96016
commit 4d8707df4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
orm_lib/src/mysql_impl/MysqlConnection.cc
View File

@ -236,8 +236,6 @@ void MysqlConnection::handleEvent()
if (revents & POLLPRI)
status |= MYSQL_WAIT_EXCEPT;
status = (status & waitStatus_);
if (status == 0 && waitStatus_ != 0)
return;
MYSQL *ret;
if (status_ == ConnectStatus::Connecting)
{
@ -355,7 +353,7 @@ void MysqlConnection::continueSetCharacterSet(int status)
{
LOG_ERROR << "Error(" << err << ") \""
<< mysql_error(mysqlPtr_.get()) << "\"";
LOG_ERROR << "Failed to mysql_real_connect()";
LOG_ERROR << "Failed to mysql_set_character_set_cont()";
handleClosed();
return;
}
@ -378,9 +376,10 @@ void MysqlConnection::startSetCharacterSet()
{
if (err)
{
LOG_ERROR << "error";
loop_->queueInLoop(
[thisPtr = shared_from_this()] { thisPtr->outputError(); });
LOG_ERROR << "Error(" << err << ") \""
<< mysql_error(mysqlPtr_.get()) << "\"";
LOG_ERROR << "Failed to mysql_set_character_set_start()";
handleClosed();
return;
}
status_ = ConnectStatus::Ok;