summaryrefslogtreecommitdiff
path: root/extra/mariabackup
diff options
context:
space:
mode:
Diffstat (limited to 'extra/mariabackup')
-rw-r--r--extra/mariabackup/backup_mysql.cc4
-rw-r--r--extra/mariabackup/datasink.c1
-rw-r--r--extra/mariabackup/ds_archive.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.cc17
-rw-r--r--extra/mariabackup/fil_cur.cc2
-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
-rw-r--r--extra/mariabackup/xtrabackup.cc7
17 files changed, 37 insertions, 13 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc
index 4a33f9ef4e5..e8881b9604e 100644
--- a/extra/mariabackup/backup_mysql.cc
+++ b/extra/mariabackup/backup_mysql.cc
@@ -1656,8 +1656,8 @@ static void check_mdl_lock_works(const char *table_name)
MYSQL *test_con= xb_mysql_connect();
char *query;
xb_a(asprintf(&query,
- "SET STATEMENT max_statement_time=1 FOR ALTER TABLE %s"
- " ADD COLUMN mdl_lock_column int", table_name));
+ "SET STATEMENT max_statement_time=1 FOR ALTER TABLE %s FORCE",
+ table_name));
int err = mysql_query(test_con, query);
DBUG_ASSERT(err);
int err_no = mysql_errno(test_con);
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_archive.c b/extra/mariabackup/ds_archive.c
index 50afcce4bc7..ae473bc3385 100644
--- a/extra/mariabackup/ds_archive.c
+++ b/extra/mariabackup/ds_archive.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 <archive.h>
#include <archive_entry.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..7f230256e7a 100644
--- a/extra/mariabackup/encryption_plugin.cc
+++ b/extra/mariabackup/encryption_plugin.cc
@@ -1,3 +1,19 @@
+/* Copyright (c) 2017, MariaDB Corporation.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
+
+#include <my_global.h>
#include <mysqld.h>
#include <mysql.h>
#include <xtrabackup.h>
@@ -149,6 +165,7 @@ static void encryption_plugin_init(int argc, char **argv)
{
/* Patch optional and mandatory plugins, we only need to load the one in xb_plugin_load. */
mysql_optional_plugins[0] = mysql_mandatory_plugins[0] = 0;
+ plugin_maturity = MariaDB_PLUGIN_MATURITY_UNKNOWN; /* mariabackup accepts all plugins */
msg("Loading encryption plugin\n");
for (int i= 1; i < argc; i++)
msg("\t Encryption plugin parameter : '%s'\n", argv[i]);
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc
index f6e6fe43085..627ef7a4b72 100644
--- a/extra/mariabackup/fil_cur.cc
+++ b/extra/mariabackup/fil_cur.cc
@@ -22,8 +22,8 @@ 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>
#include <fsp0fsp.h>
#include <srv0start.h>
diff --git a/extra/mariabackup/write_filt.cc b/extra/mariabackup/write_filt.cc
index 40ecef6ff79..382a31f859f 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 1cc16affbf2..6e02bf5ceab 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 fa250132c04..03bd2fda646 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"
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 016ddb6c60f..fbac626abc3 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -43,6 +43,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
//#define XTRABACKUP_TARGET_IS_PLUGIN
+#include <my_global.h>
#include <my_config.h>
#include <unireg.h>
#include <mysql_version.h>
@@ -1477,6 +1478,9 @@ innodb_init_param(void)
srv_page_size = 0;
srv_page_size_shift = 0;
+#ifdef BTR_CUR_HASH_ADAPT
+ btr_ahi_parts = 1;
+#endif /* BTR_CUR_HASH_ADAPT */
if (innobase_page_size != (1LL << 14)) {
int n_shift = (int)get_bit_shift((ulint) innobase_page_size);
@@ -1578,9 +1582,6 @@ innodb_init_param(void)
}
srv_adaptive_flushing = FALSE;
- srv_file_format = 1; /* Barracuda */
- srv_max_file_format_at_startup = UNIV_FORMAT_MIN; /* on */
- /* --------------------------------------------------*/
srv_file_flush_method_str = innobase_unix_file_flush_method;
View Lorry Controller Status