diff --git a/mysql-test/suite/mariabackup/full_backup.test b/mysql-test/suite/mariabackup/full_backup.test
|
index f987410cf76..d1d2ea21c08 100644
|
--- a/mysql-test/suite/mariabackup/full_backup.test
|
+++ b/mysql-test/suite/mariabackup/full_backup.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
CREATE TABLE t(i INT) ENGINE INNODB;
|
INSERT INTO t VALUES(1);
|
echo # xtrabackup backup;
|
diff --git a/mysql-test/suite/mariabackup/incremental_backup.test b/mysql-test/suite/mariabackup/incremental_backup.test
|
index b92d7b323ac..af6260dd591 100644
|
--- a/mysql-test/suite/mariabackup/incremental_backup.test
|
+++ b/mysql-test/suite/mariabackup/incremental_backup.test
|
@@ -1,10 +1,10 @@
|
-call mtr.add_suppression("InnoDB: New log files created");
|
+--source include/innodb_page_size.inc
|
|
+call mtr.add_suppression("InnoDB: New log files created");
|
|
let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
|
let $incremental_dir=$MYSQLTEST_VARDIR/tmp/backup_inc1;
|
|
-
|
CREATE TABLE t(i INT) ENGINE INNODB;
|
INSERT INTO t VALUES(1);
|
|
@@ -32,4 +32,3 @@ DROP TABLE t;
|
# Cleanup
|
rmdir $basedir;
|
rmdir $incremental_dir;
|
-
|
diff --git a/mysql-test/suite/mariabackup/incremental_encrypted.test b/mysql-test/suite/mariabackup/incremental_encrypted.test
|
index 04f4ba5d18a..d8f5e182ca2 100644
|
--- a/mysql-test/suite/mariabackup/incremental_encrypted.test
|
+++ b/mysql-test/suite/mariabackup/incremental_encrypted.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
if (!$EXAMPLE_KEY_MANAGEMENT_SO)
|
{
|
--skip needs example_key_management plugin
|
diff --git a/mysql-test/suite/mariabackup/partial.test b/mysql-test/suite/mariabackup/partial.test
|
index 3b1de8ebc25..61a6450bb2d 100644
|
--- a/mysql-test/suite/mariabackup/partial.test
|
+++ b/mysql-test/suite/mariabackup/partial.test
|
@@ -1,8 +1,13 @@
|
+--source include/innodb_page_size.inc
|
+
|
# Export single table from backup
|
# (xtrabackup with --prepare --export)
|
|
CREATE TABLE t1(i INT) ENGINE INNODB;
|
INSERT INTO t1 VALUES(1);
|
+CREATE TABLE t21(i INT) ENGINE INNODB;
|
+INSERT INTO t21 VALUES(1);
|
+
|
CREATE TABLE t2(i int) ENGINE INNODB;
|
|
echo # xtrabackup backup;
|
@@ -13,13 +18,23 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup "--tables=te
|
--enable_result_log
|
list_files $targetdir/test *.ibd;
|
|
+# Inject a junk .ibd file into backup dir to
|
+# see if prepare does not choke on it.
|
+write_file $targetdir/test/junk.ibd;
|
+EOF
|
+write_file $targetdir/test/junk.frm;
|
+EOF
|
+
|
+
|
echo # xtrabackup prepare;
|
--disable_result_log
|
-exec $XTRABACKUP --prepare --export --target-dir=$targetdir;
|
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group-suffix=.1 --prepare --export --target-dir=$targetdir;
|
--enable_result_log
|
|
-ALTER TABLE t1 DISCARD TABLESPACE;
|
+list_files $targetdir/test *.cfg;
|
+
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
+ALTER TABLE t1 DISCARD TABLESPACE;
|
copy_file $targetdir/test/t1.ibd $MYSQLD_DATADIR/test/t1.ibd;
|
copy_file $targetdir/test/t1.cfg $MYSQLD_DATADIR/test/t1.cfg;
|
ALTER TABLE t1 IMPORT TABLESPACE;
|
@@ -27,5 +42,5 @@ ALTER TABLE t1 IMPORT TABLESPACE;
|
SELECT * FROM t1;
|
DROP TABLE t1;
|
DROP TABLE t2;
|
+DROP TABLE t21;
|
rmdir $targetdir;
|
-
|
diff --git a/mysql-test/suite/mariabackup/partial_exclude.test b/mysql-test/suite/mariabackup/partial_exclude.test
|
index 631f9d7ee71..67020f28bb3 100644
|
--- a/mysql-test/suite/mariabackup/partial_exclude.test
|
+++ b/mysql-test/suite/mariabackup/partial_exclude.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
# Test --databases-exclude and --tables-exclude feature of xtrabackup 2.3.8
|
|
CREATE TABLE t1(i INT) ENGINE INNODB;
|
@@ -27,4 +29,3 @@ DROP TABLE t1;
|
DROP TABLE t2;
|
DROP DATABASE db2;
|
rmdir $targetdir;
|
-
|
diff --git a/mysql-test/suite/mariabackup/small_ibd.test b/mysql-test/suite/mariabackup/small_ibd.test
|
index 23d6b08c047..e8175fce7c9 100644
|
--- a/mysql-test/suite/mariabackup/small_ibd.test
|
+++ b/mysql-test/suite/mariabackup/small_ibd.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
# Check if ibd smaller than page size are skipped
|
# It is possible, due to race conditions that new file
|
# is created by server while xtrabackup is running
|
@@ -15,4 +17,3 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=
|
--enable_result_log
|
remove_file $_datadir/test/small.ibd;
|
rmdir $targetdir;
|
-
|
diff --git a/mysql-test/suite/mariabackup/xb_aws_key_management.test b/mysql-test/suite/mariabackup/xb_aws_key_management.test
|
index 149e422c058..9f69cbec8b8 100644
|
--- a/mysql-test/suite/mariabackup/xb_aws_key_management.test
|
+++ b/mysql-test/suite/mariabackup/xb_aws_key_management.test
|
@@ -1,7 +1,9 @@
|
+--source include/innodb_page_size.inc
|
--source include/have_debug.inc
|
+
|
if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'aws_key_management' AND PLUGIN_STATUS='ACTIVE'`)
|
{
|
- --skip needs aws_key_management plugin plugin
|
+ --skip needs aws_key_management plugin
|
}
|
|
CREATE TABLE t(c VARCHAR(10)) ENGINE INNODB encrypted=yes;
|
diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
|
index 9a5be4b19d6..2cca740d7dd 100644
|
--- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
|
+++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
|
@@ -1,25 +1,22 @@
|
-source include/have_file_key_management.inc;
|
+--source include/innodb_page_size_small.inc
|
+--source include/have_file_key_management.inc
|
|
-CREATE TABLE t1(c1 INT, b VARCHAR(2400), index(b(100),c1)) ENGINE=INNODB ROW_FORMAT=compressed ENCRYPTED=YES;
|
+CREATE TABLE t1(c1 INT, b VARCHAR(2400), index(b(100),c1))
|
+ENGINE=INNODB ROW_FORMAT=compressed ENCRYPTED=YES;
|
|
-DELIMITER //;
|
-CREATE PROCEDURE innodb_insert_proc (REPEAT_COUNT INT)
|
-BEGIN
|
- DECLARE CURRENT_NUM INT;
|
- SET CURRENT_NUM = 0;
|
- WHILE CURRENT_NUM < REPEAT_COUNT DO
|
- INSERT INTO t1 VALUES(CURRENT_NUM, concat(uuid(), CURRENT_NUM, repeat('ab', floor(rand()*100) ), uuid()));
|
- SET CURRENT_NUM = CURRENT_NUM + 1;
|
- END WHILE;
|
-END//
|
-DELIMITER ;//
|
+BEGIN;
|
+let $n= 5000;
|
+let $i= $n;
|
+let $u= `SELECT uuid()`;
|
+--disable_query_log
|
+while ($i) {
|
+ eval INSERT INTO t1
|
+ VALUES($n-$i, concat('$u', $n-$i, repeat('ab', floor(rand()*100)), '$u'));
|
+ dec $i;
|
+}
|
+--enable_query_log
|
COMMIT;
|
|
-SET AUTOCOMMIT=0;
|
-CALL innodb_insert_proc(50000);
|
-COMMIT;
|
-
|
-
|
echo # xtrabackup backup;
|
--disable_result_log
|
let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
|
@@ -31,5 +28,4 @@ exec $INNOBACKUPEX --apply-log $targetdir;
|
--enable_result_log
|
select sum(c1) from t1;
|
DROP TABLE t1;
|
-drop procedure innodb_insert_proc;
|
rmdir $targetdir;
|
diff --git a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
|
index a98d7802d76..ed22769b2fe 100644
|
--- a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
|
+++ b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
|
@@ -1,4 +1,5 @@
|
-source include/have_file_key_management.inc;
|
+--source include/innodb_page_size.inc
|
+--source include/have_file_key_management.inc
|
|
CREATE TABLE film_text (
|
film_id SMALLINT NOT NULL,
|
diff --git a/mysql-test/suite/mariabackup/xb_history.test b/mysql-test/suite/mariabackup/xb_history.test
|
index 28de50127c6..5eca32db2db 100644
|
--- a/mysql-test/suite/mariabackup/xb_history.test
|
+++ b/mysql-test/suite/mariabackup/xb_history.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
|
--disable_result_log
|
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --history=foo --backup --target-dir=$targetdir;
|
diff --git a/mysql-test/suite/mariabackup/xb_page_compress.test b/mysql-test/suite/mariabackup/xb_page_compress.test
|
index 876aa1a2791..7180ac555bc 100644
|
--- a/mysql-test/suite/mariabackup/xb_page_compress.test
|
+++ b/mysql-test/suite/mariabackup/xb_page_compress.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
CREATE TABLE t1(c1 INT, b CHAR(20)) ENGINE=INNODB PAGE_COMPRESSED=1;
|
|
DELIMITER //;
|
@@ -41,4 +43,3 @@ SELECT COUNT(*) FROM t1;
|
DROP PROCEDURE innodb_insert_proc;
|
DROP TABLE t1;
|
rmdir $targetdir;
|
-
|
diff --git a/mysql-test/suite/mariabackup/xb_partition.test b/mysql-test/suite/mariabackup/xb_partition.test
|
index f051a52edbc..93fa3b3bcbe 100644
|
--- a/mysql-test/suite/mariabackup/xb_partition.test
|
+++ b/mysql-test/suite/mariabackup/xb_partition.test
|
@@ -1,3 +1,4 @@
|
+--source include/innodb_page_size.inc
|
--source include/have_partition.inc
|
|
CREATE TABLE t1(a INT) ENGINE=InnoDB;
|
diff --git a/mysql-test/suite/mariabackup/xbstream.test b/mysql-test/suite/mariabackup/xbstream.test
|
index f2b4704a87e..9161d227b20 100644
|
--- a/mysql-test/suite/mariabackup/xbstream.test
|
+++ b/mysql-test/suite/mariabackup/xbstream.test
|
@@ -1,3 +1,5 @@
|
+--source include/innodb_page_size.inc
|
+
|
CREATE TABLE t(i INT) ENGINE INNODB;
|
INSERT INTO t VALUES(1);
|
|