Merge 10.3 into 10.4

mysql-test/suite/versioning/r/select.result

@@ -242,8 +242,7 @@ ERROR HY000: Table `t1` is not system-versioned
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
 select * from t1 for system_time all for update;
-x
-1
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 a