Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman 2019-11-08 14:13:06 +02:00
commit d67442356e
2 changed files with 10 additions and 0 deletions

8
.gitignore vendored
View File

@ -59,3 +59,11 @@ CLion project files
.reviewboardrc
# vscode
.vscode
# Build directories
/debug*/
/release*/
/package*/
# Emacs
TAGS

View File

@ -570,6 +570,8 @@ void RCRSession::handleError(GWBUF* errbuf, DCB* problem_dcb, mxs_error_action_t
{
mxb_assert(problem_dcb->role == DCB::Role::BACKEND);
mxb_assert(problem_dcb->session->state == SESSION_STATE_STARTED);
MXS_INFO("Server '%s' failed", problem_dcb->server->name());
DCB* client_dcb = problem_dcb->session->client_dcb;
client_dcb->func.write(client_dcb, gwbuf_clone(errbuf));