diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 10:04:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 10:04:04 +0300 |
| commit | ff5ecfd335582967d76c418514a4310f6804fdaa (patch) | |
| tree | ba03f320adb82398b30f63438e8cc3a5ece10be0 /sql/wsrep_mysqld.cc | |
| parent | da9201dd5bfbd5df68612c33e2b087705d44bec7 (diff) | |
| download | mariadb-git-ff5ecfd335582967d76c418514a4310f6804fdaa.tar.gz | |
Correct the merge 0f83c8878dc1389212c134f65d37a43d9d248250
Re-enable some Galera tests that should have been enabled.
Add client_ed25519.so to debian/libmariadb3.install;
merge e47a143fc08f7114fd877ad8ee83d322f877a672 correctly.
Remove a duplicated #include from wsrep_mysqld.cc.
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 28a9ddb0bea..08adaac0e85 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -38,7 +38,6 @@ #include <cstdlib> #include "log_event.h" #include <slave.h> -#include "sql_plugin.h" /* wsrep_plugins_pre_init() */ wsrep_t *wsrep = NULL; /* |