diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 17:32:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 17:32:08 +0200 |
| commit | 666565c7f00b0f39bbb459a428efd0093ed05fc8 (patch) | |
| tree | d9b7dc26979995f0a332c50d2daf043c2a75866e /sql/wsrep_sst.cc | |
| parent | 92abdcca5a5324f0727112ab2417d10c7a8d5094 (diff) | |
| parent | 8de233af815f28d096ac4ff136525abc3ddc771d (diff) | |
| download | mariadb-git-666565c7f00b0f39bbb459a428efd0093ed05fc8.tar.gz | |
Merge 10.5 into 10.6
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 25992459060..ffba339de4a 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; } } } |