database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-09 08:33:08 +02:00
parent 1f2ff25eba 8494039757
commit 06b7fce9f2
579 changed files with 9031 additions and 4828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/threadpool_common.cc
View File

@ -164,9 +164,8 @@ THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
if (!setup_connection_thread_globals(thd))
{
if (!login_connection(thd))
if (!thd_prepare_connection(thd))
{
prepare_new_connection_state(thd);
/*
Check if THD is ok, as prepare_new_connection_state()