summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-30 11:12:56 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-30 11:12:56 +0300
commit1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec (patch)
treec1da70f7f990dae02c5dfe70fd75299ced68873c /sql/sql_connect.cc
parent0fb84216a35046a4574dec214dcce03130a797c1 (diff)
parentb11ff3d49581d9e7b6f8b990f08e85e4d6384418 (diff)
downloadmariadb-git-1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 826951f7c9d..37d2b0e902f 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -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