From 4c5a2e504d9c20347e202aabd3b3c299b7efedb1 Mon Sep 17 00:00:00 2001 From: Aleksey Midenkov Date: Sat, 15 Oct 2016 14:15:28 +0000 Subject: [PATCH] Tests: create, select_pkeycache, select_jcl6 results create: 5de65ef52df9f941ec8eea93f4801283e3d7fa05 select_pkeycache, select_jcl6: ded545be9f7a416d1d50d653ab278dd0fc7e6c5e --- mysql-test/r/create.result | 24 ++++++++++++------------ mysql-test/r/select_jcl6.result | 2 +- mysql-test/r/select_pkeycache.result | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index b0255c7457b8e..70037b4466eda 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 ade583db19e6a..be93151ea6fe7 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 c260e2ff333c7..ebcc1155fc966 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;