diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
| commit | 068fb8569f2300e4a5c08413a756417d923ecf5f (patch) | |
| tree | ab008f1be51ee322cbeeb5aa73042430a6e63347 /sql/wsrep_sst.cc | |
| parent | 59277a7d83374bc293cd58f8be509a81792d829e (diff) | |
| parent | dbda20caffbb22115b6f30069b716bc505c49d11 (diff) | |
| download | mariadb-git-068fb8569f2300e4a5c08413a756417d923ecf5f.tar.gz | |
bzr merge -rtag:mariadb-5.5.40 maria/5.5
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index d2263e3e171..1d17d8b8c8e 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -13,8 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "wsrep_sst.h" - +#include <my_config.h> #include <mysqld.h> #include <m_ctype.h> #include <my_sys.h> @@ -24,11 +23,13 @@ #include <sql_acl.h> #include <sql_reload.h> #include <sql_parse.h> -#include "wsrep_priv.h" -#include "wsrep_utils.h" #include <cstdio> #include <cstdlib> +#include "wsrep_priv.h" +#include "wsrep_utils.h" +#include "wsrep_sst.h" + extern const char wsrep_defaults_file[]; const char* wsrep_sst_method = WSREP_SST_DEFAULT; |