diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
| commit | 8de233af815f28d096ac4ff136525abc3ddc771d (patch) | |
| tree | 98c524bbad2ebdced9635b83e51f647dac978cfc /sql/wsrep_sst.cc | |
| parent | 1015cbde5985e7e89c887ab30ce7c772671194c5 (diff) | |
| parent | fd5e103aa4b97e080dd497b93992e5f32ef83fdf (diff) | |
| download | mariadb-git-8de233af815f28d096ac4ff136525abc3ddc771d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 6a7b16d243e..93ec040079f 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -29,6 +29,7 @@ #include "wsrep_utils.h" #include "wsrep_xid.h" #include "wsrep_thd.h" +#include "wsrep_mysqld.h" #include <cstdio> #include <cstdlib> @@ -596,6 +597,7 @@ static void* sst_joiner_thread (void* a) goto err; } else { wsrep_gtid_server.domain_id= (uint32) domain_id; + wsrep_gtid_domain_id= (uint32)domain_id; } } } |