summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-04-25 18:59:41 +0200
committerSergei Golubchik <serg@mariadb.org>2016-04-25 22:46:43 +0200
commit22204807317c467b2f09dd0dcd13898a48501b10 (patch)
tree9ad61ee9838a7996a427eccfd81f27538f6954c5 /sql
parenta98ecc2aafcbc08f27a2f7faba872e7a0d25fee2 (diff)
downloadmariadb-git-22204807317c467b2f09dd0dcd13898a48501b10.tar.gz
MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed after wait_timeout
restore the error message that was removed by mistake in ec38c1bbd709
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_connect.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 16b53da1ebd..61f8b4081eb 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1092,7 +1092,8 @@ void end_connection(THD *thd)
}
if (!thd->killed && (net->error && net->vio != 0))
- thd->print_aborted_warning(1, ER(ER_UNKNOWN_ERROR));
+ thd->print_aborted_warning(1,
+ thd->stmt_da->is_error() ? thd->stmt_da->message() : ER(ER_UNKNOWN_ERROR));
}