database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-30 11:12:56 +03:00
parent 0fb84216a3 b11ff3d495
commit 1a9b6c4c7f
70 changed files with 958 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_connect.cc
View File

@ -1409,7 +1409,7 @@ void do_handle_one_connection(CONNECT *connect)
if (WSREP(thd))
{
mysql_mutex_lock(&thd->LOCK_thd_data);
thd->wsrep_query_state= QUERY_EXITING;
wsrep_thd_set_query_state(thd, QUERY_EXITING);
mysql_mutex_unlock(&thd->LOCK_thd_data);
}
#endif