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
2018-05-10 13:01:42 +02:00
parent 92a13148e8 ff579bc814
commit 9b1824dcd2
145 changed files with 2320 additions and 2653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_connect.cc
View File

@ -1340,9 +1340,9 @@ void do_handle_one_connection(CONNECT *connect)
#ifdef WITH_WSREP
if (WSREP(thd))
{
mysql_mutex_lock(&thd->LOCK_wsrep_thd);
mysql_mutex_lock(&thd->LOCK_thd_data);
thd->wsrep_query_state= QUERY_EXITING;
mysql_mutex_unlock(&thd->LOCK_wsrep_thd);
mysql_mutex_unlock(&thd->LOCK_thd_data);
}
#endif
end_thread: