diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index b0255c7457b..70037b4466e 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1957,8 +1957,8 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `XNo` int(10) unsigned DEFAULT NULL,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 drop table if exists t1;
@@ -2042,8 +2042,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `A` int(11) DEFAULT NULL,
   `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 DROP TABLE t1;
@@ -2056,8 +2056,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `A` int(11) DEFAULT NULL,
   `B` int(11) DEFAULT NULL,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 DROP TABLE t1;
@@ -2075,8 +2075,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `A` int(11) DEFAULT NULL,
   `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 DROP TABLE t1;
@@ -2089,8 +2089,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `A` int(11) DEFAULT NULL,
   `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 DROP TABLE t1;
@@ -2103,8 +2103,8 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `A` int(11) DEFAULT NULL,
   `B` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING,
-  `sys_trx_start` timestamp(6) NULL GENERATED AS ROW START,
-  `sys_trx_end` timestamp(6) NULL GENERATED AS ROW END,
+  `sys_trx_start` timestamp(6) NOT NULL GENERATED AS ROW START,
+  `sys_trx_end` timestamp(6) NOT NULL GENERATED AS ROW END,
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 DROP TABLE t1;
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index ade583db19e..be93151ea6f 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -5578,7 +5578,7 @@ INSERT INTO t1(x, y) VALUES
 DELETE FROM t1 WHERE x = 3;
 DELETE FROM t1 WHERE x > 7;
 INSERT INTO t1(x, y) VALUES(3, 33);
-SELECT @time := Sys_start FROM t1 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07' WHERE x = 3 AND y = 33;
+SELECT @time := Sys_start FROM t1 WHERE x = 3 AND y = 33 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07';
 @time := Sys_start
 Sys_start
 SELECT x, y FROM t1;
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index c260e2ff333..ebcc1155fc9 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -5567,7 +5567,7 @@ INSERT INTO t1(x, y) VALUES
 DELETE FROM t1 WHERE x = 3;
 DELETE FROM t1 WHERE x > 7;
 INSERT INTO t1(x, y) VALUES(3, 33);
-SELECT @time := Sys_start FROM t1 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07' WHERE x = 3 AND y = 33;
+SELECT @time := Sys_start FROM t1 WHERE x = 3 AND y = 33 FOR SYSTEM_TIME BETWEEN TIMESTAMP '0-0-0 0:0:0' AND TIMESTAMP '2038-01-19 04:14:07';
 @time := Sys_start
 Sys_start
 SELECT x, y FROM t1;