summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-12 12:16:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-12 12:16:40 +0300
commit60c04be6599597548ad07ce11e1d7d4004a7cc9c (patch)
tree491f1b7b65b82ed270e5af34db4d4cebf760e501 /sql/wsrep_mysqld.cc
parentebddd8699c02519f99a313182b96ae1c04a67a63 (diff)
parent9554ef067878c4650ef4b9ad44e0b222cdb313a5 (diff)
downloadmariadb-git-60c04be6599597548ad07ce11e1d7d4004a7cc9c.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index fde29ae434d..4307b41d632 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -47,7 +47,6 @@
#include <string>
#include "log_event.h"
#include <slave.h>
-#include "sql_plugin.h" /* wsrep_plugins_pre_init() */
#include <sstream>