rename versioning_* variables

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,
@@ -503,9 +503,9 @@ 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'
 drop database test;
 create database test;

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

@@ -48,23 +48,23 @@ dept for system_time from timestamp @ts_1 to timestamp @ts_2 d
 where d.dept_id = 10
 and d.dept_id = e.dept_id;
 emp_id	dept_id	name	salary	sys_trx_start	sys_trx_end	dept_id	name	sys_trx_start	sys_trx_end
-set statement versioning_asof_timestamp=@ts_0 for
+set statement system_versioning_asof=@ts_0 for
 select * from emp e, dept d
 where d.dept_id = 10
 and d.dept_id = e.dept_id;
 emp_id	dept_id	name	salary	dept_id	name
-set statement versioning_asof_timestamp=@ts_1 for
+set statement system_versioning_asof=@ts_1 for
 select * from emp e, dept d
 where d.dept_id = 10
 and d.dept_id = e.dept_id;
 emp_id	dept_id	name	salary	dept_id	name
-set statement versioning_asof_timestamp=@ts_2 for
+set statement system_versioning_asof=@ts_2 for
 select * from emp e, dept d
 where d.dept_id = 10
 and d.dept_id = e.dept_id;
 emp_id	dept_id	name	salary	dept_id	name
 1	10	bill	1000	10	accounting
-set statement versioning_asof_timestamp=@ts_3 for
+set statement system_versioning_asof=@ts_3 for
 select * from emp e, dept d
 where d.dept_id = 10
 and d.dept_id = e.dept_id;