diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 13:28:56 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2022-09-05 13:28:56 +0300 |
| commit | ba987a46c9a7cb0e7418882c5be224c733098cf0 (patch) | |
| tree | 3ebfc87e6530fc271c556441cfa5413caf73b4e5 /sql/lock.cc | |
| parent | 244fdc435da364aea3b6e55835115cc04fe3297f (diff) | |
| parent | 2917bd0d2cf417cbf9c83b64ae2b7806bdb2f34e (diff) | |
| download | mariadb-git-ba987a46c9a7cb0e7418882c5be224c733098cf0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index ec91655375e..70b04e53583 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -79,7 +79,10 @@ #include "sql_parse.h" // is_log_table_write_query #include "sql_handler.h" #include <hash.h> +#ifdef WITH_WSREP #include "wsrep_mysqld.h" +#include "wsrep_server_state.h" +#endif /** @defgroup Locking Locking |