summaryrefslogtreecommitdiff
path: root/sql/wsrep_server_service.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-04 18:43:00 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-04 18:43:00 +0300
commit4337a3b5f9cfd71b785d75c49f65bb7e67e6dd55 (patch)
treec3b7457e12e73ee9820b1942c23d737bd93eeab0 /sql/wsrep_server_service.cc
parentd50f776930425e540678238798b4f7666b9cbb76 (diff)
parent50f3a38e89a0f9d72c5a3f3039c39d4d08dfe0e6 (diff)
downloadmariadb-git-4337a3b5f9cfd71b785d75c49f65bb7e67e6dd55.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_server_service.cc')
-rw-r--r--sql/wsrep_server_service.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/wsrep_server_service.cc b/sql/wsrep_server_service.cc
index 6d737463f07..50aea494255 100644
--- a/sql/wsrep_server_service.cc
+++ b/sql/wsrep_server_service.cc
@@ -201,6 +201,7 @@ void Wsrep_server_service::log_view(
wsrep_update_cluster_state_uuid(os.str().c_str());
mysql_mutex_unlock(&LOCK_status);
wsrep_config_state->set(view);
+ wsrep_cluster_conf_id= view.view_seqno().get();
if (view.status() == wsrep::view::primary)
{