From 623c3f673195e143338cb657df554e397097fb42 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 2 Jul 2017 11:26:02 +1000 Subject: thread_group_close: release mutex in all branches Found by Coverity scan - id 92087 --- sql/threadpool_unix.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sql/threadpool_unix.cc') diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index 6075c758e40..0ffe08a8051 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -979,24 +979,26 @@ static void thread_group_close(thread_group_t *thread_group) if (pipe(thread_group->shutdown_pipe)) { - DBUG_VOID_RETURN; + goto end; } /* Wake listener */ if (io_poll_associate_fd(thread_group->pollfd, thread_group->shutdown_pipe[0], NULL)) { - DBUG_VOID_RETURN; + goto end; + } + { + char c= 0; + if (write(thread_group->shutdown_pipe[1], &c, 1) < 0) + goto end; } - char c= 0; - if (write(thread_group->shutdown_pipe[1], &c, 1) < 0) - DBUG_VOID_RETURN; - /* Wake all workers. */ while(wake_thread(thread_group) == 0) { } +end: mysql_mutex_unlock(&thread_group->mutex); DBUG_VOID_RETURN; -- cgit v1.2.1