Merge 10.1 into 10.2

Author: dr-m

mysql-test/suite/mariabackup/incremental_backup.result

@@ -1,13 +1,22 @@
 call mtr.add_suppression("InnoDB: New log files created");
-CREATE TABLE t(i INT) ENGINE INNODB;
+CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB;
+BEGIN;
+INSERT INTO t VALUES(2);
+connect  con1,localhost,root,,;
+SET GLOBAL innodb_flush_log_at_trx_commit = 1;
 INSERT INTO t VALUES(1);
 # Create full backup , modify table, then create incremental/differential backup
-INSERT INTO t VALUES(2);
+BEGIN;
+INSERT INTO t VALUES(0);
+DELETE FROM t WHERE i=0;
+connection default;
+COMMIT;
 SELECT * FROM t;
 i
 1
 2
 # Prepare full backup, apply incremental one
+disconnect con1;
 # Restore and check results
 # shutdown server
 # remove datadir

mysql-test/suite/mariabackup/incremental_backup.test

@@ -5,14 +5,22 @@ 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;
+CREATE TABLE t(i INT PRIMARY KEY) ENGINE INNODB;
+BEGIN;
+INSERT INTO t VALUES(2);
+connect (con1,localhost,root,,);
+SET GLOBAL innodb_flush_log_at_trx_commit = 1;
 INSERT INTO t VALUES(1);
 
 echo # Create full backup , modify table, then create incremental/differential backup;
 --disable_result_log
 exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf  --backup --target-dir=$basedir;
 --enable_result_log
-INSERT INTO t VALUES(2);
+BEGIN;
+INSERT INTO t VALUES(0);
+DELETE FROM t WHERE i=0;
+connection default;
+COMMIT;
 SELECT * FROM t;
 exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf  --backup --ftwrl-wait-timeout=5 --ftwrl-wait-threshold=300 --ftwrl-wait-query-type=all --target-dir=$incremental_dir --incremental-basedir=$basedir;
 
@@ -21,6 +29,7 @@ echo # Prepare full backup, apply incremental one;
 exec $XTRABACKUP --prepare --target-dir=$basedir;
 exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ;
 
+disconnect con1;
 echo # Restore and check results;
 let $targetdir=$basedir;
 -- source include/restart_and_restore.inc

storage/xtradb/trx/trx0undo.cc

@@ -2025,6 +2025,7 @@ trx_undo_free_prepared(
 			/* lock_trx_release_locks() assigns
 			trx->is_recovered=false */
 			ut_a(srv_read_only_mode
+			     || srv_apply_log_only
 			     || srv_force_recovery >= SRV_FORCE_NO_TRX_UNDO);
 			break;
 		default: