diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 14:05:30 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 14:05:30 +0300 |
| commit | 9fefd440b516f2941710891d72489dac98a97d19 (patch) | |
| tree | 38243aa3db89d9ae17fcc7366347129586656fe8 /sql/mdl.cc | |
| parent | 3c7887a85f2ed628aee28bf586c2ed115fe47186 (diff) | |
| parent | ba987a46c9a7cb0e7418882c5be224c733098cf0 (diff) | |
| download | mariadb-git-9fefd440b516f2941710891d72489dac98a97d19.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index ce6e64791b7..3ba006a63a7 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -30,6 +30,9 @@ #include <mysql/psi/mysql_mdl.h> #include <algorithm> #include <array> +#ifdef WITH_WSREP +#include "wsrep_mysqld.h" +#endif static PSI_memory_key key_memory_MDL_context_acquire_locks; |