Merge 10.2 into 10.3

mysql-test/suite/innodb/r/undo_truncate_recover.result

@@ -9,8 +9,8 @@ update t1 set c = 'MariaDB';
 update t1 set c = 'InnoDB';
 set global debug_dbug = '+d,ib_undo_trunc';
 commit;
+drop table t1;
 call mtr.add_suppression("InnoDB: innodb_undo_tablespaces=0 disables dedicated undo log tablespaces");
 call mtr.add_suppression("InnoDB: The redo log transaction size ");
 SET GLOBAL innodb_fast_shutdown=0;
 FOUND 1 /ib_undo_trunc/ in mysqld.1.err
-drop table t1;

mysql-test/suite/innodb/t/undo_truncate_recover.opt

+--innodb-purge-threads=1

mysql-test/suite/innodb/t/undo_truncate_recover.test

@@ -34,6 +34,7 @@ update t1 set c = 'MariaDB';
 update t1 set c = 'InnoDB';
 eval set global debug_dbug = '+d,$SEARCH_PATTERN';
 commit;
+drop table t1;
 call mtr.add_suppression("InnoDB: innodb_undo_tablespaces=0 disables dedicated undo log tablespaces");
 # FIXME: remove this work-around, and generate less log!
 call mtr.add_suppression("InnoDB: The redo log transaction size ");
@@ -43,5 +44,3 @@ SET GLOBAL innodb_fast_shutdown=0;
 # FIXME: remove this work-around, and generate less log!
 --let $restart_parameters= --innodb-buffer-pool-size=16m --innodb-undo-tablespaces=1
 --source include/start_mysqld.inc
-
-drop table t1;

storage/innobase/row/row0sel.cc

@@ -4642,7 +4642,7 @@ row_search_mvcc(
 
 		if (err != DB_SUCCESS) {
 			rec = NULL;
-			goto lock_wait_or_error;
+			goto page_read_error;
 		}
 
 		pcur->trx_if_known = trx;
@@ -4696,7 +4696,7 @@ row_search_mvcc(
 				index->table->file_unreadable = true;
 			}
 			rec = NULL;
-			goto lock_wait_or_error;
+			goto page_read_error;
 		}
 	}
 
@@ -4717,7 +4717,7 @@ row_search_mvcc(
 
 	if (!index->table->is_readable()) {
 		err = DB_DECRYPTION_FAILED;
-		goto lock_wait_or_error;
+		goto page_read_error;
 	}
 
 	ut_ad(!!page_rec_is_comp(rec) == comp);
@@ -4824,7 +4824,7 @@ row_search_mvcc(
 			ut_ad(0);
 			err = DB_CORRUPTION;
 
-			goto lock_wait_or_error;
+			goto page_read_error;
 		} else {
 			/* The user may be dumping a corrupt table. Jump
 			over the corruption to recover as much as possible. */
@@ -5645,6 +5645,10 @@ row_search_mvcc(
 	goto normal_return;
 
 lock_wait_or_error:
+	if (!dict_index_is_spatial(index)) {
+		btr_pcur_store_position(pcur, &mtr);
+	}
+page_read_error:
 	/* Reset the old and new "did semi-consistent read" flags. */
 	if (UNIV_UNLIKELY(prebuilt->row_read_type
 			  == ROW_READ_DID_SEMI_CONSISTENT)) {
@@ -5652,11 +5656,6 @@ row_search_mvcc(
 	}
 	did_semi_consistent_read = FALSE;
 
-	/*-------------------------------------------------------------*/
-	if (!dict_index_is_spatial(index)) {
-		btr_pcur_store_position(pcur, &mtr);
-	}
-
 lock_table_wait:
 	mtr.commit();
 	mtr_has_extra_clust_latch = FALSE;