System Versioning 1.0 pre6

Merge remote-tracking branch 'mariadb/bb-10.3-temporal-serg' into trunk

Author: midenok

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -4897,6 +4897,76 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_ALTER_HISTORY
+SESSION_VALUE	ERROR
+GLOBAL_VALUE	ERROR
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	ERROR
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	ENUM
+VARIABLE_COMMENT	Versioning ALTER TABLE mode. ERROR: Fail ALTER with error; KEEP: Keep historical system rows and subject them to ALTER; 
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	ERROR,KEEP
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_ASOF
+SESSION_VALUE	DEFAULT
+GLOBAL_VALUE	DEFAULT
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	DEFAULT
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	VARCHAR
+VARIABLE_COMMENT	Default value for the FOR SYSTEM_TIME AS OF clause
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	DEFAULT
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
+VARIABLE_NAME	SYSTEM_VERSIONING_FORCE
+SESSION_VALUE	OFF
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Force system versioning for all created tables
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	SYSTEM_VERSIONING_HIDE
+SESSION_VALUE	AUTO
+GLOBAL_VALUE	AUTO
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	AUTO
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	ENUM
+VARIABLE_COMMENT	Hide system versioning from being displayed in table info. AUTO: hide implicit system fields only in non-versioned and AS OF queries; IMPLICIT: hide implicit system fields in all queries; FULL: hide any system fields in all queries and hide versioning info in SHOW commands; NEVER: don't hide system fields
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	AUTO,IMPLICIT,FULL,NEVER
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	SYSTEM_VERSIONING_INNODB_ALGORITHM_SIMPLE
+SESSION_VALUE	ON
+GLOBAL_VALUE	ON
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	ON
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	TABLE_DEFINITION_CACHE
 SESSION_VALUE	NULL
 GLOBAL_VALUE	400
@@ -5373,76 +5443,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NEVER,COMPLEMENTARY,PREFERABLY
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_ALTER_HISTORY
-SESSION_VALUE	ERROR
-GLOBAL_VALUE	ERROR
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ERROR
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Versioning ALTER TABLE mode. ERROR: Fail ALTER with error; KEEP: Keep historical system rows and subject them to ALTER; 
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	ERROR,KEEP
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_ASOF_TIMESTAMP
-SESSION_VALUE	CURRENT
-GLOBAL_VALUE	CURRENT
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	CURRENT
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Default AS OF value for versioned queries
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	CURRENT,ALL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	NULL
-VARIABLE_NAME	VERSIONING_FORCE
-SESSION_VALUE	OFF
-GLOBAL_VALUE	OFF
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Force system versioning for all created tables
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
-VARIABLE_NAME	VERSIONING_HIDE
-SESSION_VALUE	AUTO
-GLOBAL_VALUE	AUTO
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	AUTO
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Hide system versioning from being displayed in table info. AUTO: hide implicit system fields only in non-versioned and AS OF queries; IMPLICIT: hide implicit system fields in all queries; FULL: hide any system fields in all queries and hide versioning info in SHOW commands; NEVER: don't hide system fields
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	AUTO,IMPLICIT,FULL,NEVER
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	VERSIONING_INNODB_ALGORITHM_SIMPLE
-SESSION_VALUE	ON
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use simple algorithm of timestamp handling in InnoDB instead of TRX_SEES
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	WAIT_TIMEOUT
 SESSION_VALUE	28800
 GLOBAL_VALUE	28800

mysql-test/suite/versioning/common.opt

@@ -1,2 +1,2 @@
---versioning-hide=implicit
+--system-versioning-hide=implicit
 --plugin-load=versioning

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

@@ -1,5 +1,5 @@
-select @@versioning_alter_history;
-@@versioning_alter_history
+select @@system_versioning_alter_history;
+@@system_versioning_alter_history
 ERROR
 create table t(
 a int
@@ -21,7 +21,7 @@ t	CREATE TABLE `t` (
   PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 alter table t add column y int;
-ERROR HY000: Not allowed for versioned `test`.`t`. Change `versioning_alter_history` to proceed with ALTER.
+ERROR HY000: Not allowed for versioned `test`.`t`. Change @@system_versioning_alter_history to proceed with ALTER.
 alter table t engine innodb;
 ERROR HY000: Not allowed for versioned `test`.`t`. Change to/from native versioning engine is prohibited.
 alter table t drop system versioning;
@@ -30,7 +30,7 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-set versioning_alter_history= keep;
+set system_versioning_alter_history= keep;
 alter table t
 add column trx_start bigint(20) unsigned generated always as row start,
 add column trx_end bigint(20) unsigned generated always as row end,
@@ -398,6 +398,16 @@ t	CREATE TABLE `t` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 call verify_vtq;
 No	A	B	C	D
+create or replace table t (a int);
+insert t values (1),(2),(3),(4);
+alter table t add b int auto_increment null unique;
+select * from t;
+a	b
+1	1
+2	2
+3	3
+4	4
+drop table t;
 create or replace table t (a int) with system versioning engine=innodb;
 insert into t values (1), (2), (3);
 delete from t where a<3;
@@ -493,10 +503,10 @@ Table	Create Table
 t	CREATE TABLE `t` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-set versioning_alter_history= SURVIVE;
-ERROR 42000: Variable 'versioning_alter_history' can't be set to the value of 'SURVIVE'
-set versioning_alter_history= DROP;
-ERROR 42000: Variable 'versioning_alter_history' can't be set to the value of 'DROP'
+set system_versioning_alter_history= SURVIVE;
+ERROR 42000: Variable 'system_versioning_alter_history' can't be set to the value of 'SURVIVE'
+set system_versioning_alter_history= DROP;
+ERROR 42000: Variable 'system_versioning_alter_history' can't be set to the value of 'DROP'
 create or replace table t (a int) with system versioning;
 alter table t add system versioning;
 ERROR HY000: Table `t` is already system-versioned table

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

@@ -119,13 +119,13 @@ emp_id	name	mgr	address
 2	bill	1	New York
 3	kate	1	London
 4	john	1	Paris
-with ancestors as (select * from emp natural join addr where 1 for system_time all) select * from ancestors;
+with ancestors as (select * from (select * from emp natural join addr) for system_time all as t) select * from ancestors;
 emp_id	name	mgr	address
 1	bill	0	Moscow
 2	bill	1	New York
 3	kate	1	London
 4	john	1	Paris
-select * from emp natural join addr where 1 for system_time all;
+select * from (select * from emp natural join addr) for system_time all as t;
 emp_id	name	mgr	address
 1	bill	0	Moscow
 2	bill	1	New York

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

@@ -91,13 +91,11 @@ ancestors
 as
 (
 select e.emp_id, e.name, e.mgr
-from emp as e
+from emp for system_time as of timestamp @ts as e
 where name = 'bill'
-  for system_time as of timestamp @ts
-union
+  union
 select ee.emp_id, ee.name, ee.mgr
-from emp
-for system_time as of timestamp @ts as ee,
+from emp for system_time as of timestamp @ts as ee,
 ancestors as a
 where ee.mgr = a.emp_id
 )
@@ -112,9 +110,8 @@ ancestors
 as
 (
   select e.emp_id, e.name, e.mgr
-  from emp as e
+  from emp for system_time as of timestamp @ts as e
   where name = 'bill'
-  for system_time as of timestamp @ts
   union
   select ee.emp_id, ee.name, ee.mgr
   from emp for system_time as of timestamp @ts as ee,
@@ -170,7 +167,7 @@ select * from (select * from vt1, t2) as s0;
 x	y
 1	10
 ### SYSTEM_TIME clash
-select * from (select * from t1 for system_time all) dt0 for system_time all;
+select * from (select * from t1 for system_time all) for system_time all as dt0;
 ERROR HY000: SYSTEM_TIME is not allowed outside historical `dt0`
 select * from vt1 for system_time all;
 ERROR HY000: SYSTEM_TIME is not allowed outside historical `vt1`

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

@@ -25,7 +25,7 @@ a	b
 3	NULL
 Warnings:
 Warning	4112	Attempt to read unversioned field `b` in historical query
-select count(*) from t group by b for system_time as of timestamp now(6);
+select count(*) from t for system_time as of timestamp now(6) group by b;
 count(*)
 2
 Warnings:
@@ -44,41 +44,10 @@ a	b
 Warnings:
 Warning	4112	Attempt to read unversioned field `b` in historical query
 Warning	4112	Attempt to read unversioned field `b` in historical query
-select * from t group by a having a=2 for system_time as of timestamp now(6);
-a	b
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
-select * from t group by b having b=2 for system_time as of timestamp now(6);
+select * from t for system_time as of timestamp now(6) group by a having a=2;
 a	b
 Warnings:
 Warning	4112	Attempt to read unversioned field `b` in historical query
-select a from t where b=2 for system_time as of timestamp now(6);
-a
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
-select a from t where b=NULL for system_time as of timestamp now(6);
-a
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
-select a from t where b is NULL for system_time as of timestamp now(6);
-a
-1
-3
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
-select count(*), b from t group by b having b=NULL for system_time as of timestamp now(6);
-count(*)	b
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
-select a, b from t;
-a	b
-1	2
-3	4
-select count(*) from t for system_time as of timestamp now(6) group by b;
-count(*)
-2
-Warnings:
-Warning	4112	Attempt to read unversioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) group by b having b=2;
 a	b
 Warnings:
@@ -101,6 +70,10 @@ select count(*), b from t for system_time as of timestamp now(6) group by b havi
 count(*)	b
 Warnings:
 Warning	4112	Attempt to read unversioned field `b` in historical query
+select a, b from t;
+a	b
+1	2
+3	4
 create or replace table t (
 a int,
 b int not null without system versioning