summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-21 16:57:08 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-24 01:05:48 +0200
commitd5a6bae7c0bbef9963b73b064bec3ae1e47ec45c (patch)
tree57dc5e7ab98b69dc9498e3b392d569719f42cc40
parent4aaa38d26ed95127b8424100c8a14c77af15fc11 (diff)
downloadmariadb-git-d5a6bae7c0bbef9963b73b064bec3ae1e47ec45c.tar.gz
Fix compilation errors
Diffstat
-rw-r--r--extra/mariabackup/datasink.c1
-rw-r--r--extra/mariabackup/ds_buffer.c2
-rw-r--r--extra/mariabackup/ds_compress.c1
-rw-r--r--extra/mariabackup/ds_local.c2
-rw-r--r--extra/mariabackup/ds_stdout.c1
-rw-r--r--extra/mariabackup/ds_tmpfile.c1
-rw-r--r--extra/mariabackup/ds_xbstream.c2
-rw-r--r--extra/mariabackup/encryption_plugin.cc1
-rw-r--r--extra/mariabackup/fil_cur.cc1
-rw-r--r--extra/mariabackup/write_filt.cc1
-rw-r--r--extra/mariabackup/wsrep.cc2
-rw-r--r--extra/mariabackup/xbstream.c2
-rw-r--r--extra/mariabackup/xbstream_read.c2
-rw-r--r--extra/mariabackup/xbstream_write.c2
14 files changed, 14 insertions, 7 deletions
diff --git a/extra/mariabackup/datasink.c b/extra/mariabackup/datasink.c
index 460e0e8ca19..84418cd7528 100644
--- a/extra/mariabackup/datasink.c
+++ b/extra/mariabackup/datasink.c
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
+#include <my_global.h>
#include <my_base.h>
#include "common.h"
#include "datasink.h"
diff --git a/extra/mariabackup/ds_buffer.c b/extra/mariabackup/ds_buffer.c
index 4bb314c0f50..9a0c660c15c 100644
--- a/extra/mariabackup/ds_buffer.c
+++ b/extra/mariabackup/ds_buffer.c
@@ -23,7 +23,7 @@ Writes to the destination datasink are guaranteed to not be smaller than a
specified buffer size (DS_DEFAULT_BUFFER_SIZE by default), with the only
exception for the last write for a file. */
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include "ds_buffer.h"
#include "common.h"
diff --git a/extra/mariabackup/ds_compress.c b/extra/mariabackup/ds_compress.c
index 15801c8abd4..6b00f6a6dce 100644
--- a/extra/mariabackup/ds_compress.c
+++ b/extra/mariabackup/ds_compress.c
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
+#include <my_global.h>
#include <mysql_version.h>
#include <my_base.h>
#include <quicklz.h>
diff --git a/extra/mariabackup/ds_local.c b/extra/mariabackup/ds_local.c
index 3e2b1e0129b..7ba027cf00b 100644
--- a/extra/mariabackup/ds_local.c
+++ b/extra/mariabackup/ds_local.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include <mysys_err.h>
#include "common.h"
diff --git a/extra/mariabackup/ds_stdout.c b/extra/mariabackup/ds_stdout.c
index 91a514ddf64..934d59b97c9 100644
--- a/extra/mariabackup/ds_stdout.c
+++ b/extra/mariabackup/ds_stdout.c
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
+#include <my_global.h>
#include <my_base.h>
#include <mysys_err.h>
#include "common.h"
diff --git a/extra/mariabackup/ds_tmpfile.c b/extra/mariabackup/ds_tmpfile.c
index b039d83ba03..75b08af78ce 100644
--- a/extra/mariabackup/ds_tmpfile.c
+++ b/extra/mariabackup/ds_tmpfile.c
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
/* Do all writes to temporary files first, then pipe them to the specified
datasink in a serialized way in deinit(). */
+#include <my_global.h>
#include <my_base.h>
#include "common.h"
#include "datasink.h"
diff --git a/extra/mariabackup/ds_xbstream.c b/extra/mariabackup/ds_xbstream.c
index 42924a72d7f..43cac4fcdf7 100644
--- a/extra/mariabackup/ds_xbstream.c
+++ b/extra/mariabackup/ds_xbstream.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include "common.h"
#include "datasink.h"
diff --git a/extra/mariabackup/encryption_plugin.cc b/extra/mariabackup/encryption_plugin.cc
index 76512c185e2..208a6b8e419 100644
--- a/extra/mariabackup/encryption_plugin.cc
+++ b/extra/mariabackup/encryption_plugin.cc
@@ -1,3 +1,4 @@
+#include <my_global.h>
#include <mysqld.h>
#include <mysql.h>
#include <xtrabackup.h>
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc
index b733f98457e..e00827076d6 100644
--- a/extra/mariabackup/fil_cur.cc
+++ b/extra/mariabackup/fil_cur.cc
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
/* Source file cursor implementation */
+#include <my_global.h>
#include <my_base.h>
#include <fil0fil.h>
diff --git a/extra/mariabackup/write_filt.cc b/extra/mariabackup/write_filt.cc
index a0633818405..d4728c6469a 100644
--- a/extra/mariabackup/write_filt.cc
+++ b/extra/mariabackup/write_filt.cc
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
/* Page write filters implementation */
+#include <my_global.h>
#include <my_base.h>
#include "common.h"
#include "write_filt.h"
diff --git a/extra/mariabackup/wsrep.cc b/extra/mariabackup/wsrep.cc
index be11e058255..3c06c0023e0 100644
--- a/extra/mariabackup/wsrep.cc
+++ b/extra/mariabackup/wsrep.cc
@@ -40,7 +40,7 @@ permission notice:
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include <handler.h>
#include <trx0sys.h>
diff --git a/extra/mariabackup/xbstream.c b/extra/mariabackup/xbstream.c
index f3880f9ec03..65257664e54 100644
--- a/extra/mariabackup/xbstream.c
+++ b/extra/mariabackup/xbstream.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include <my_getopt.h>
#include <hash.h>
diff --git a/extra/mariabackup/xbstream_read.c b/extra/mariabackup/xbstream_read.c
index 8d19242301b..3e38cffddae 100644
--- a/extra/mariabackup/xbstream_read.c
+++ b/extra/mariabackup/xbstream_read.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include <zlib.h>
#include "common.h"
diff --git a/extra/mariabackup/xbstream_write.c b/extra/mariabackup/xbstream_write.c
index 978be71e7dd..649bce28788 100644
--- a/extra/mariabackup/xbstream_write.c
+++ b/extra/mariabackup/xbstream_write.c
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*******************************************************/
-#include <mysql_version.h>
+#include <my_global.h>
#include <my_base.h>
#include <zlib.h>
#include "common.h"
View Lorry Controller Status