rename system_time columns

sys_trx_start -> row_start
sys_trx_end -> row_end

Author: vuvova

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

@@ -118,29 +118,29 @@ t	CREATE TABLE `t` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 create or replace table t (
 a int,
-sys_trx_start timestamp(6) as row start invisible,
-sys_trx_end timestamp(6) as row end invisible,
-period for system_time(sys_trx_start, sys_trx_end))
+row_start timestamp(6) as row start invisible,
+row_end timestamp(6) as row end invisible,
+period for system_time(row_start, row_end))
 with system versioning;
 select * from t for system_time all;
 a
-alter table t drop column sys_trx_start;
-alter table t drop column sys_trx_end;
+alter table t drop column row_start;
+alter table t drop column row_end;
 select * from t for system_time all;
 a
-alter table t drop column sys_trx_start;
-ERROR 42000: Can't DROP COLUMN `sys_trx_start`; check that it exists
-alter table t drop column sys_trx_end;
-ERROR 42000: Can't DROP COLUMN `sys_trx_end`; check that it exists
+alter table t drop column row_start;
+ERROR 42000: Can't DROP COLUMN `row_start`; check that it exists
+alter table t drop column row_end;
+ERROR 42000: Can't DROP COLUMN `row_end`; check that it exists
 create or replace table t (
 a int,
-sys_trx_start timestamp(6) as row start invisible,
-sys_trx_end timestamp(6) as row end invisible,
-period for system_time(sys_trx_start, sys_trx_end))
+row_start timestamp(6) as row start invisible,
+row_end timestamp(6) as row end invisible,
+period for system_time(row_start, row_end))
 with system versioning;
 select * from t for system_time all;
 a
-alter table t drop column sys_trx_start, drop column sys_trx_end;
+alter table t drop column row_start, drop column row_end;
 select * from t for system_time all;
 a
 create or replace table t(
@@ -172,10 +172,10 @@ a
 3
 2
 1
-select sys_trx_start from t where a=3 into @tm;
+select row_start from t where a=3 into @tm;
 alter table t add column b int;
-select @tm=sys_trx_start from t where a=3;
-@tm=sys_trx_start
+select @tm=row_start from t where a=3;
+@tm=row_start
 1
 show create table t;
 Table	Create Table
@@ -374,31 +374,31 @@ a	b
 4	2
 create or replace table t (
 a int,
-sys_trx_start timestamp(6) as row start invisible,
-sys_trx_end timestamp(6) as row end invisible,
-period for system_time(sys_trx_start, sys_trx_end)
+row_start timestamp(6) as row start invisible,
+row_end timestamp(6) as row end invisible,
+period for system_time(row_start, row_end)
 ) with system versioning;
-alter table t change column sys_trx_start asdf timestamp(6);
-ERROR HY000: Can not change system versioning field `sys_trx_start`
+alter table t change column row_start asdf timestamp(6);
+ERROR HY000: Can not change system versioning field `row_start`
 insert into t values (1);
-alter table t modify column sys_trx_start bigint unsigned;
-ERROR HY000: Can not change system versioning field `sys_trx_start`
+alter table t modify column row_start bigint unsigned;
+ERROR HY000: Can not change system versioning field `row_start`
 create or replace table t (
 a int,
-sys_trx_start timestamp(6) as row start invisible,
-sys_trx_end timestamp(6) as row end invisible,
-period for system_time(sys_trx_start, sys_trx_end)
+row_start timestamp(6) as row start invisible,
+row_end timestamp(6) as row end invisible,
+period for system_time(row_start, row_end)
 ) with system versioning;
 select * from t;
 a
 alter table t drop system versioning;
-ERROR HY000: System versioning field `sys_trx_start` exists
-alter table t drop column sys_trx_start;
+ERROR HY000: System versioning field `row_start` exists
+alter table t drop column row_start;
 select * from t;
 a
 alter table t drop system versioning;
-ERROR HY000: System versioning field `sys_trx_end` exists
-alter table t drop column sys_trx_end;
+ERROR HY000: System versioning field `row_end` exists
+alter table t drop column row_end;
 select * from t;
 a
 alter table t drop system versioning;
@@ -450,20 +450,20 @@ alter table t drop column a;
 ERROR HY000: Table `t` must have at least one versioned column
 alter table t drop column a, drop column a;
 ERROR 42000: Can't DROP COLUMN `a`; check that it exists
-create or replace table t1 (sys_trx_start int);
+create or replace table t1 (row_start int);
 alter table t1 with system versioning;
-ERROR 42S21: Duplicate column name 'sys_trx_start'
-create or replace table t1 (sys_trx_end int);
+ERROR 42S21: Duplicate column name 'row_start'
+create or replace table t1 (row_end int);
 alter table t1 with system versioning;
-ERROR 42S21: Duplicate column name 'sys_trx_end'
-create or replace table t1 (a int, sys_trx_start int) with system versioning;
-ERROR 42S21: Duplicate column name 'sys_trx_start'
+ERROR 42S21: Duplicate column name 'row_end'
+create or replace table t1 (a int, row_start int) with system versioning;
+ERROR 42S21: Duplicate column name 'row_start'
 create or replace table t1 (a int) with system versioning;
 set statement system_versioning_alter_history=keep for
-alter table t1 add column sys_trx_start int;
-ERROR 42S21: Duplicate column name 'sys_trx_start'
+alter table t1 add column row_start int;
+ERROR 42S21: Duplicate column name 'row_start'
 set statement system_versioning_alter_history=keep for
-alter table t1 add column sys_trx_start timestamp(6);
-ERROR 42S21: Duplicate column name 'sys_trx_start'
+alter table t1 add column row_start timestamp(6);
+ERROR 42S21: Duplicate column name 'row_start'
 drop database test;
 create database test;

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

@@ -211,7 +211,7 @@ t3	CREATE TABLE `t3` (
 ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1
 ## For versioned table
 insert into t1 values (1);
-select sys_trx_start from t1 into @sys_trx_start;
+select row_start from t1 into @row_start;
 insert into t0 (y) values (2);
 select st from t0 into @st;
 create or replace table t2 with system versioning as select * from t1;
@@ -224,7 +224,7 @@ t2	CREATE TABLE `t2` (
 select * from t2;
 x23
 1
-select * from t2 where sys_trx_start <= @sys_trx_start;
+select * from t2 where row_start <= @row_start;
 x23
 ### 2. source table with visible system fields, target with invisible
 create or replace table t3 with system versioning as select * from t0;
@@ -237,7 +237,7 @@ t3	CREATE TABLE `t3` (
 ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 select * from t3 where y > 2;
 y	st	en
-select y from t3 where st = @st and sys_trx_start > @st;
+select y from t3 where st = @st and row_start > @st;
 y
 2
 ### 3. source and target table with visible system fields
@@ -269,13 +269,13 @@ t3	CREATE TABLE `t3` (
 select * from t3;
 x23
 1
-create or replace table t3 with system versioning select x23, sys_trx_start from t1;
+create or replace table t3 with system versioning select x23, row_start from t1;
 ERROR HY000: Wrong parameters for `t3`: missing 'AS ROW END'
-create or replace table t3 with system versioning select x23, sys_trx_end from t1;
+create or replace table t3 with system versioning select x23, row_end from t1;
 ERROR HY000: Wrong parameters for `t3`: missing 'AS ROW START'
 # Prepare checking for historical row
 delete from t1;
-select sys_trx_end from t1 for system_time all into @sys_trx_end;
+select row_end from t1 for system_time all into @row_end;
 delete from t0;
 select en from t0 for system_time all into @en;
 ## Combinations of versioned + non-versioned
@@ -291,7 +291,7 @@ t3	CREATE TABLE `t3` (
 select * from t3 for system_time all;
 x23	y
 1	3
-select * from t3 for system_time all where sys_trx_start = @sys_trx_start and sys_trx_end = @sys_trx_end;
+select * from t3 for system_time all where row_start = @row_start and row_end = @row_end;
 x23	y
 create or replace table t2 like t0;
 insert into t2 (y) values (1), (2);
@@ -308,14 +308,14 @@ y
 ## Default engine detection
 create or replace table t1 (x25 int) with system versioning engine NON_DEFAULT_ENGINE;
 create or replace table t2
-as select x25, sys_trx_start, sys_trx_end from t1 for system_time all;
+as select x25, row_start, row_end from t1 for system_time all;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `x25` int(11) DEFAULT NULL
 ) ENGINE=DEFAULT_ENGINE DEFAULT CHARSET=latin1
 create or replace table t2 with system versioning
-as select x25, sys_trx_start, sys_trx_end from t1;
+as select x25, row_start, row_end from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -333,7 +333,7 @@ ERROR HY000: `st` must be of type TIMESTAMP(6) for system-versioned table `t2`
 create or replace table t1 (x27 int, id int) with system versioning engine NON_DEFAULT_ENGINE;
 create or replace table t2 (b int, id int);
 create or replace table t3 with system versioning
-as select t2.b, t1.x27, t1.sys_trx_start, t1.sys_trx_end from t2 inner join t1 on t2.id=t1.id;
+as select t2.b, t1.x27, t1.row_start, t1.row_end from t2 inner join t1 on t2.id=t1.id;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -368,7 +368,7 @@ en SYS_DATATYPE as row end invisible,
 period for system_time (st, en)
 ) with system versioning;
 create or replace table t3
-as select x30, y, sys_trx_start, sys_trx_end, st, en from t1, t2;
+as select x30, y, row_start, row_end, st, en from t1, t2;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -383,7 +383,7 @@ st SYS_DATATYPE as row start invisible,
 en SYS_DATATYPE as row end invisible,
 period for system_time (st, en)
 ) with system versioning
-as select x30, y, sys_trx_start, sys_trx_end, st, en from t1, t2;
+as select x30, y, row_start, row_end, st, en from t1, t2;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (

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

@@ -43,10 +43,10 @@ execute stmt;
 emp_id	name	mgr
 4	john	1
 drop prepare stmt;
-select emp_id from (select emp_id from emp where sys_trx_end>'2031-1-1') as tmp;
+select emp_id from (select emp_id from emp where row_end>'2031-1-1') as tmp;
 emp_id
 4
-set @tmp= "select emp_id from (select emp_id from emp where sys_trx_end>'2031-1-1') as tmp";
+set @tmp= "select emp_id from (select emp_id from emp where row_end>'2031-1-1') as tmp";
 prepare stmt from @tmp;
 execute stmt;
 emp_id
@@ -134,11 +134,11 @@ set @t0= now(6);
 delete from t1;
 insert into t1 values (2);
 insert into t2 values (10);
-select * from (select *, t1.sys_trx_end, t1.sys_trx_end as endo from t1) as s0;
-x	sys_trx_end	endo
+select * from (select *, t1.row_end, t1.row_end as endo from t1) as s0;
+x	row_end	endo
 2	#	#
-select * from (select *, t1.sys_trx_end, t2.sys_trx_start from t1, t2) as s0;
-x	y	sys_trx_end	sys_trx_start
+select * from (select *, t1.row_end, t2.row_start from t1, t2) as s0;
+x	y	row_end	row_start
 2	10	#	#
 # SYSTEM_TIME propagation from inner to outer
 select * from (select * from t1 for system_time as of timestamp @t0, t2) as s0;
@@ -148,11 +148,11 @@ with s1 as (select * from t1 for system_time as of timestamp @t0, t2) select * f
 x	y
 1	10
 # leading table selection
-select * from (select *, t1.sys_trx_end from t2, t1 for system_time as of timestamp @t0) as s2;
-y	x	sys_trx_end
+select * from (select *, t1.row_end from t2, t1 for system_time as of timestamp @t0) as s2;
+y	x	row_end
 10	1	#
-with s3 as (select *, t1.sys_trx_end from t2, t1 for system_time as of timestamp @t0) select * from s3;
-y	x	sys_trx_end
+with s3 as (select *, t1.row_end from t2, t1 for system_time as of timestamp @t0) select * from s3;
+y	x	row_end
 10	1	#
 ### VIEW instead of t1
 set @q= concat("create view vt1 as select * from t1 for system_time as of timestamp '", @t0, "'");
@@ -211,12 +211,12 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where; Using join buffer (flat, BNL join)
 Query A:
-Note	1003	select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y1`,`test`.`t2`.`x` AS `x2`,`test`.`t2`.`y` AS `y2` from `test`.`t1` FOR SYSTEM_TIME ALL join `test`.`t2` FOR SYSTEM_TIME ALL where `test`.`t1`.`x` = `test`.`t2`.`x` and `test`.`t1`.`sys_trx_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t1`.`sys_trx_start` <= <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`sys_trx_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`sys_trx_start` <= <cache>(cast(current_timestamp(6) as datetime(6)))
+Note	1003	select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y1`,`test`.`t2`.`x` AS `x2`,`test`.`t2`.`y` AS `y2` from `test`.`t1` FOR SYSTEM_TIME ALL join `test`.`t2` FOR SYSTEM_TIME ALL where `test`.`t1`.`x` = `test`.`t2`.`x` and `test`.`t1`.`row_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t1`.`row_start` <= <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`row_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`row_start` <= <cache>(cast(current_timestamp(6) as datetime(6)))
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where; Using join buffer (flat, BNL join)
 Query B:
-Note	1003	select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y1`,`test`.`t2`.`x` AS `x2`,`test`.`t2`.`y` AS `y2` from `test`.`t1` FOR SYSTEM_TIME ALL join `test`.`t2` FOR SYSTEM_TIME ALL where `test`.`t1`.`x` = `test`.`t2`.`x` and `test`.`t1`.`sys_trx_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t1`.`sys_trx_start` <= <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`sys_trx_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`sys_trx_start` <= <cache>(cast(current_timestamp(6) as datetime(6)))
+Note	1003	select `test`.`t1`.`x` AS `x`,`test`.`t1`.`y` AS `y1`,`test`.`t2`.`x` AS `x2`,`test`.`t2`.`y` AS `y2` from `test`.`t1` FOR SYSTEM_TIME ALL join `test`.`t2` FOR SYSTEM_TIME ALL where `test`.`t1`.`x` = `test`.`t2`.`x` and `test`.`t1`.`row_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t1`.`row_start` <= <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`row_end` > <cache>(cast(current_timestamp(6) as datetime(6))) and `test`.`t2`.`row_start` <= <cache>(cast(current_timestamp(6) as datetime(6)))
 Fine result: queries A and B are equal.
 ## LEFT JOIN: t1, t2 versioned
 select * from (

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

@@ -80,10 +80,10 @@ set @str= concat('
   engine ', engine);
 prepare stmt from @str; execute stmt; drop prepare stmt;
 insert into t1 values(1, 1, 1);
-select sys_trx_start, sys_trx_end from t1 into @sys_start, @sys_end;
+select row_start, row_end from t1 into @sys_start, @sys_end;
 select id, a, b from t1;
 insert into t1 values(2, 2, 2);
-select id, a, b, sys_trx_start > @sys_start as C, sys_trx_end = @sys_end as D from t1 where id = 2;
+select id, a, b, row_start > @sys_start as C, row_end = @sys_end as D from t1 where id = 2;
 drop table t1;
 end~~
 create procedure test_05(
@@ -306,18 +306,18 @@ x	y	current
 1	1	0
 create or replace table t1 (x int) with system versioning engine innodb;
 insert into t1 values  (1), (2);
-insert into t1 (sys_trx_start) select sys_trx_end from t1;
-ERROR HY000: The value specified for generated column 'sys_trx_start' in table 't1' ignored
-insert into t1 (sys_trx_start, sys_trx_end) values (DEFAULT, 1);
-ERROR HY000: The value specified for generated column 'sys_trx_end' in table 't1' ignored
+insert into t1 (row_start) select row_end from t1;
+ERROR HY000: The value specified for generated column 'row_start' in table 't1' ignored
+insert into t1 (row_start, row_end) values (DEFAULT, 1);
+ERROR HY000: The value specified for generated column 'row_end' in table 't1' ignored
 select @@sql_mode into @saved_mode;
 set sql_mode= '';
-insert into t1 (x, sys_trx_start, sys_trx_end) values (3, 4, 5);
+insert into t1 (x, row_start, row_end) values (3, 4, 5);
 Warnings:
-Warning	1906	The value specified for generated column 'sys_trx_start' in table 't1' ignored
-Warning	1906	The value specified for generated column 'sys_trx_end' in table 't1' ignored
+Warning	1906	The value specified for generated column 'row_start' in table 't1' ignored
+Warning	1906	The value specified for generated column 'row_end' in table 't1' ignored
 set sql_mode= @saved_mode;
-insert into t1 (sys_trx_start, sys_trx_end) values (DEFAULT, DEFAULT);
+insert into t1 (row_start, row_end) values (DEFAULT, DEFAULT);
 select * from t1;
 x
 1

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

@@ -127,9 +127,9 @@ partition p0 history,
 partition pn current);
 set @now= now(6);
 insert into t1 values (1);
-set @str= concat('select x, sys_trx_start < @now as A, sys_trx_end > @now as B from t1 partition (p0)');
+set @str= concat('select x, row_start < @now as A, row_end > @now as B from t1 partition (p0)');
 prepare select_p0 from @str;
-set @str= concat('select x, sys_trx_start > @now as C, sys_trx_end = timestamp\'2038-01-19 03:14:07.999999\' as D from t1 partition (pn)');
+set @str= concat('select x, row_start > @now as C, row_end = timestamp\'2038-01-19 03:14:07.999999\' as D from t1 partition (pn)');
 prepare select_pn from @str;
 execute select_p0;
 x	A	B
@@ -140,7 +140,7 @@ x	C	D
 explain partitions select * from tN;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 N	SIMPLE	tN	pn	system	NULL	NULL	NULL	NULL	N	
-set @str= concat('select sys_trx_start from t1 partition (pn) into @ts0');
+set @str= concat('select row_start from t1 partition (pn) into @ts0');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;
@@ -151,7 +151,7 @@ x	A	B
 1	1	1
 execute select_pn;
 x	C	D
-set @str= concat('select sys_trx_start from t1 partition (p0) into @ts1');
+set @str= concat('select row_start from t1 partition (p0) into @ts1');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;
@@ -166,7 +166,7 @@ x	A	B
 execute select_pn;
 x	C	D
 2	1	1
-set @str= concat('select sys_trx_start from t1 partition (pn) into @ts0');
+set @str= concat('select row_start from t1 partition (pn) into @ts0');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;
@@ -181,15 +181,15 @@ x	C	D
 3	1	1
 drop prepare select_p0;
 drop prepare select_pn;
-set @str= concat('select sys_trx_start from t1 partition (p0) where x = 2 into @ts1');
+set @str= concat('select row_start from t1 partition (p0) where x = 2 into @ts1');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;
-set @str= concat('select sys_trx_end from t1 partition (p0) where x = 2 into @ts2');
+set @str= concat('select row_end from t1 partition (p0) where x = 2 into @ts2');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;
-set @str= concat('select sys_trx_start from t1 partition (pn) into @ts3');
+set @str= concat('select row_start from t1 partition (pn) into @ts3');
 prepare stmt from @str;
 execute stmt;
 drop prepare stmt;

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

@@ -1,7 +1,7 @@
 call create_table('t', 'x int');
 insert t values (1, 2);
 replace t values (1, 3);
-select *, current_row(sys_trx_end) as current from t for system_time all
+select *, current_row(row_end) as current from t for system_time all
 order by x;
 id	x	current
 1	2	0