summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2019-06-23 19:07:20 +0300
committerEugene Kosov <claprix@yandex.ru>2019-06-23 20:33:13 +0300
commitddeeb42e0b1adc2158fa0baec70d84a0ae3e5828 (patch)
tree148912bb6b066faa1b3e56e2887a57cbe11b875c /sql/sql_connect.cc
parent75833ef9c51e3a2cc57fea048e55ed5670df7b0d (diff)
parentcf40393471b10ca68cc1d2804c22ab9203900978 (diff)
downloadmariadb-git-ddeeb42e0b1adc2158fa0baec70d84a0ae3e5828.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_connect.cc')
-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 6b3bd283f26..3491796ba85 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1331,7 +1331,8 @@ void do_handle_one_connection(CONNECT *connect)
while (thd_is_connection_alive(thd))
{
- mysql_audit_release(thd);
+ if (mysql_audit_release_required(thd))
+ mysql_audit_release(thd);
if (do_command(thd))
break;
}