summaryrefslogtreecommitdiff
path: root/sql/threadpool_common.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-02 17:46:22 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-02 17:46:22 +0300
commite82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8 (patch)
tree3ecf4329b6a623165aa6cb392ae71998de50c89e /sql/threadpool_common.cc
parent709f0510e32981c59d7353e55a564073939db770 (diff)
parent7f1e1309bbd54a7923cf33a37938a29171ca0993 (diff)
downloadmariadb-git-e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/threadpool_common.cc')
-rw-r--r--sql/threadpool_common.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc
index 75b924a7569..6a4139197f9 100644
--- a/sql/threadpool_common.cc
+++ b/sql/threadpool_common.cc
@@ -353,7 +353,8 @@ static int threadpool_process_request(THD *thd)
{
Vio *vio;
thd->net.reading_or_writing= 0;
- mysql_audit_release(thd);
+ if (mysql_audit_release_required(thd))
+ mysql_audit_release(thd);
if ((retval= do_command(thd)) != 0)
goto end;