diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-05 18:04:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-05 18:04:23 +0200 |
| commit | e55397a46d38c008d877a1b04a88d07b21a555b6 (patch) | |
| tree | f0ddcde58c82c2869c30926efbe50d43491c7e8a /sql/wsrep_thd.cc | |
| parent | 0a7d85c97f6dd68f78ecb3e7074043ff2d4c24fc (diff) | |
| parent | dd20a43c6cb59a2ba69124cf51e22e08ca16f858 (diff) | |
| download | mariadb-git-e55397a46d38c008d877a1b04a88d07b21a555b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 770c4657e65..e610d3a6c2b 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -23,8 +23,7 @@ #include "rpl_rli.h" #include "log_event.h" #include "sql_parse.h" -#include "mysqld.h" // start_wsrep_THD(); -#include "wsrep_applier.h" // start_wsrep_THD(); +#include "wsrep_mysqld.h" // start_wsrep_THD(); #include "mysql/service_wsrep.h" #include "debug_sync.h" #include "slave.h" |