diff options
author | Vladislav Vaintroub <wlad@localhost.localdomain> | 2011-12-20 22:49:24 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@localhost.localdomain> | 2011-12-20 22:49:24 +0100 |
commit | 96041f8e1d37756f84c8da9055e966576d368443 (patch) | |
tree | d5d6af90f24c027186bb6f0aef0c67ca28b74514 /sql/threadpool_unix.cc | |
parent | df48c9bf20955c4e49009c95c5c7e1856c212e81 (diff) | |
download | mariadb-git-96041f8e1d37756f84c8da9055e966576d368443.tar.gz |
make sys_vars suite pass
Diffstat (limited to 'sql/threadpool_unix.cc')
-rw-r--r-- | sql/threadpool_unix.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc index 0b5c151d93b..93094f599aa 100644 --- a/sql/threadpool_unix.cc +++ b/sql/threadpool_unix.cc @@ -1136,18 +1136,15 @@ static int change_group(connection_t *c, if (c->logged_in) io_poll_disassociate_fd(old_group->pollfd,fd); c->thread_group->connection_count--; - mysql_mutex_lock(&old_group->mutex); + mysql_mutex_unlock(&old_group->mutex); /* Add connection to the new group. */ mysql_mutex_lock(&new_group->mutex); - c->thread_group= new_group; new_group->connection_count++; - /* Ensure that there is a listener in the new group. */ if(!new_group->thread_count && !new_group->pending_thread_start_count) ret= create_worker(new_group); - mysql_mutex_unlock(&new_group->mutex); return ret; } |