Skip to content

Commit 44506f2

Browse files
midenokmidenok
committed
SQL: vers_ sysvars renamed to versioning_
1 parent dc12395 commit 44506f2

File tree

11 files changed

+115
-115
lines changed

11 files changed

+115
-115
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5119,7 +5119,7 @@ NUMERIC_BLOCK_SIZE NULL
51195119
ENUM_VALUE_LIST NEVER,COMPLEMENTARY,PREFERABLY
51205120
READ_ONLY NO
51215121
COMMAND_LINE_ARGUMENT REQUIRED
5122-
VARIABLE_NAMEVERS_CURRENT_TIME
5122+
VARIABLE_NAMEVERSIONING_CURRENT_TIMESTAMP
51235123
SESSION_VALUE NOW
51245124
GLOBAL_VALUE NOW
51255125
GLOBAL_VALUE_ORIGIN COMPILE-TIME
@@ -5133,7 +5133,7 @@ NUMERIC_BLOCK_SIZE NULL
51335133
ENUM_VALUE_LIST NULL
51345134
READ_ONLY NO
51355135
COMMAND_LINE_ARGUMENT REQUIRED
5136-
VARIABLE_NAMEVERS_FORCE
5136+
VARIABLE_NAMEVERSIONING_FORCE
51375137
SESSION_VALUE OFF
51385138
GLOBAL_VALUE OFF
51395139
GLOBAL_VALUE_ORIGIN COMPILE-TIME
@@ -5147,7 +5147,7 @@ NUMERIC_BLOCK_SIZE NULL
51475147
ENUM_VALUE_LIST OFF,ON
51485148
READ_ONLY NO
51495149
COMMAND_LINE_ARGUMENT OPTIONAL
5150-
VARIABLE_NAMEVERS_HIDE
5150+
VARIABLE_NAMEVERSIONING_HIDE
51515151
SESSION_VALUE AUTO
51525152
GLOBAL_VALUE AUTO
51535153
GLOBAL_VALUE_ORIGIN COMPILE-TIME
@@ -5161,7 +5161,7 @@ NUMERIC_BLOCK_SIZE NULL
51615161
ENUM_VALUE_LIST AUTO,IMPLICIT,FULL,NEVER
51625162
READ_ONLY NO
51635163
COMMAND_LINE_ARGUMENT OPTIONAL
5164-
VARIABLE_NAMEVERS_INNODB_ALGORITHM_SIMPLE
5164+
VARIABLE_NAMEVERSIONING_INNODB_ALGORITHM_SIMPLE
51655165
SESSION_VALUE ON
51665166
GLOBAL_VALUE ON
51675167
GLOBAL_VALUE_ORIGIN COMPILE-TIME

‎mysql-test/suite/versioning/common.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
--innodb-sys-tables
1616
--innodb-sys-virtual
1717
--innodb-vtq
18-
--vers-hide=implicit
18+
--versioning-hide=implicit

‎mysql-test/suite/versioning/r/sysvars.result‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
create table t (a int) with system versioning;
22
insert into t values (1);
33
update t set a= 2;
4-
show global variables like 'vers_current_time';
4+
show global variables like 'versioning_current_timestamp';
55
Variable_name Value
6-
vers_current_timeNOW
7-
show variables like 'vers_current_time';
6+
versioning_current_timestampNOW
7+
show variables like 'versioning_current_timestamp';
88
Variable_name Value
9-
vers_current_timeNOW
9+
versioning_current_timestampNOW
1010
select * from t;
1111
a
1212
2
13-
set vers_current_time = '2031-1-1 0:0:0';
14-
show variables like 'vers_current_time';
13+
set versioning_current_timestamp = '2031-1-1 0:0:0';
14+
show variables like 'versioning_current_timestamp';
1515
Variable_name Value
16-
vers_current_time2031-01-01 00:00:00.000000
16+
versioning_current_timestamp2031-01-01 00:00:00.000000
1717
select * from t;
1818
a
1919
2
20-
set vers_current_time = '2011-1-1 0:0:0';
21-
show variables like 'vers_current_time';
20+
set versioning_current_timestamp = '2011-1-1 0:0:0';
21+
show variables like 'versioning_current_timestamp';
2222
Variable_name Value
23-
vers_current_time2011-01-01 00:00:00.000000
23+
versioning_current_timestamp2011-01-01 00:00:00.000000
2424
select * from t;
2525
a
26-
set vers_current_time = 'all';
27-
show variables like 'vers_current_time';
26+
set versioning_current_timestamp = 'all';
27+
show variables like 'versioning_current_timestamp';
2828
Variable_name Value
29-
vers_current_timeALL
29+
versioning_current_timestampALL
3030
select * from t;
3131
a
3232
2
@@ -41,70 +41,70 @@ select * from (select * from t) as tt;
4141
a
4242
2
4343
1
44-
set global vers_current_time= 'alley';
45-
ERROR 42000: Variable 'vers_current_time' can't be set to the value of 'alley'
46-
set global vers_current_time= null;
47-
ERROR 42000: Variable 'vers_current_time' can't be set to the value of 'NULL'
48-
set global vers_current_time= 1;
49-
ERROR 42000: Incorrect argument type to variable 'vers_current_time'
50-
set global vers_current_time= 1.1;
51-
ERROR 42000: Incorrect argument type to variable 'vers_current_time'
52-
set vers_current_time= 'alley';
53-
ERROR 42000: Variable 'vers_current_time' can't be set to the value of 'alley'
54-
set vers_current_time= null;
55-
ERROR 42000: Variable 'vers_current_time' can't be set to the value of 'NULL'
56-
set vers_current_time= 1;
57-
ERROR 42000: Incorrect argument type to variable 'vers_current_time'
58-
set vers_current_time= 1.1;
59-
ERROR 42000: Incorrect argument type to variable 'vers_current_time'
60-
set global vers_current_time= '1911-11-11 11:11:11.1111119';
61-
show global variables like 'vers_current_time';
44+
set global versioning_current_timestamp= 'alley';
45+
ERROR 42000: Variable 'versioning_current_timestamp' can't be set to the value of 'alley'
46+
set global versioning_current_timestamp= null;
47+
ERROR 42000: Variable 'versioning_current_timestamp' can't be set to the value of 'NULL'
48+
set global versioning_current_timestamp= 1;
49+
ERROR 42000: Incorrect argument type to variable 'versioning_current_timestamp'
50+
set global versioning_current_timestamp= 1.1;
51+
ERROR 42000: Incorrect argument type to variable 'versioning_current_timestamp'
52+
set versioning_current_timestamp= 'alley';
53+
ERROR 42000: Variable 'versioning_current_timestamp' can't be set to the value of 'alley'
54+
set versioning_current_timestamp= null;
55+
ERROR 42000: Variable 'versioning_current_timestamp' can't be set to the value of 'NULL'
56+
set versioning_current_timestamp= 1;
57+
ERROR 42000: Incorrect argument type to variable 'versioning_current_timestamp'
58+
set versioning_current_timestamp= 1.1;
59+
ERROR 42000: Incorrect argument type to variable 'versioning_current_timestamp'
60+
set global versioning_current_timestamp= '1911-11-11 11:11:11.1111119';
61+
show global variables like 'versioning_current_timestamp';
6262
Variable_name Value
63-
vers_current_time1911-11-11 11:11:11.111111
64-
set global vers_current_time= '1900-01-01 00:00:00';
65-
show global variables like 'vers_current_time';
63+
versioning_current_timestamp1911-11-11 11:11:11.111111
64+
set global versioning_current_timestamp= '1900-01-01 00:00:00';
65+
show global variables like 'versioning_current_timestamp';
6666
Variable_name Value
67-
vers_current_time1900-01-01 00:00:00.000000
68-
set global vers_current_time= timestamp'1911-11-11 11:11:11.1111119';
67+
versioning_current_timestamp1900-01-01 00:00:00.000000
68+
set global versioning_current_timestamp= timestamp'1911-11-11 11:11:11.1111119';
6969
Warnings:
7070
Note 1292 Truncated incorrect datetime value: '1911-11-11 11:11:11.1111119'
71-
show global variables like 'vers_current_time';
71+
show global variables like 'versioning_current_timestamp';
7272
Variable_name Value
73-
vers_current_time1911-11-11 11:11:11.111111
73+
versioning_current_timestamp1911-11-11 11:11:11.111111
7474
set @ts= timestamp'1900-01-01 00:00:00';
75-
set global vers_current_time= @ts;
76-
show global variables like 'vers_current_time';
75+
set global versioning_current_timestamp= @ts;
76+
show global variables like 'versioning_current_timestamp';
7777
Variable_name Value
78-
vers_current_time1900-01-01 00:00:00.000000
79-
set vers_current_time= '1911-11-11 11:11:11.1111119';
80-
show variables like 'vers_current_time';
78+
versioning_current_timestamp1900-01-01 00:00:00.000000
79+
set versioning_current_timestamp= '1911-11-11 11:11:11.1111119';
80+
show variables like 'versioning_current_timestamp';
8181
Variable_name Value
82-
vers_current_time1911-11-11 11:11:11.111111
83-
set vers_current_time= '1900-01-01 00:00:00';
84-
show variables like 'vers_current_time';
82+
versioning_current_timestamp1911-11-11 11:11:11.111111
83+
set versioning_current_timestamp= '1900-01-01 00:00:00';
84+
show variables like 'versioning_current_timestamp';
8585
Variable_name Value
86-
vers_current_time1900-01-01 00:00:00.000000
87-
set vers_current_time= timestamp'1911-11-11 11:11:11.1111119';
86+
versioning_current_timestamp1900-01-01 00:00:00.000000
87+
set versioning_current_timestamp= timestamp'1911-11-11 11:11:11.1111119';
8888
Warnings:
8989
Note 1292 Truncated incorrect datetime value: '1911-11-11 11:11:11.1111119'
90-
show variables like 'vers_current_time';
90+
show variables like 'versioning_current_timestamp';
9191
Variable_name Value
92-
vers_current_time1911-11-11 11:11:11.111111
92+
versioning_current_timestamp1911-11-11 11:11:11.111111
9393
set @ts= timestamp'1900-01-01 00:00:00';
94-
set vers_current_time= @ts;
95-
show variables like 'vers_current_time';
94+
set versioning_current_timestamp= @ts;
95+
show variables like 'versioning_current_timestamp';
9696
Variable_name Value
97-
vers_current_time1900-01-01 00:00:00.000000
98-
set global vers_current_time= 'now';
99-
set vers_current_time= 'now';
100-
show variables where variable_name = "vers_hide";
97+
versioning_current_timestamp1900-01-01 00:00:00.000000
98+
set global versioning_current_timestamp= 'now';
99+
set versioning_current_timestamp= 'now';
100+
show variables where variable_name = "versioning_hide";
101101
Variable_name Value
102-
vers_hideIMPLICIT
102+
versioning_hideIMPLICIT
103103
select * from t for system_time all;
104104
a
105105
2
106106
1
107-
set vers_hide= AUTO;
107+
set versioning_hide= AUTO;
108108
select * from t;
109109
a
110110
2
@@ -123,11 +123,11 @@ select * from t for system_time timestamp between '0-0-0' and current_timestamp(
123123
a sys_trx_start sys_trx_end
124124
2 TIMESTAMP TIMESTAMP
125125
1 TIMESTAMP TIMESTAMP
126-
set vers_hide= NEVER;
126+
set versioning_hide= NEVER;
127127
select * from t;
128128
a sys_trx_start sys_trx_end
129129
2 TIMESTAMP TIMESTAMP
130-
set vers_hide= FULL;
130+
set versioning_hide= FULL;
131131
create or replace table t (
132132
x int,
133133
st timestamp(6) generated always as row start,
@@ -147,4 +147,4 @@ select * from t for system_time all;
147147
x
148148
1
149149
drop table t;
150-
set vers_hide= IMPLICIT;
150+
set versioning_hide= IMPLICIT;

‎mysql-test/suite/versioning/t/foreign.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

‎mysql-test/suite/versioning/t/partition.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

‎mysql-test/suite/versioning/t/rpl_test.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

‎mysql-test/suite/versioning/t/sysvars.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

‎mysql-test/suite/versioning/t/sysvars.test‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ create table t (a int) with system versioning;
22
insert into t values (1);
33
update t set a= 2;
44

5-
show global variables like 'vers_current_time';
6-
show variables like 'vers_current_time';
5+
show global variables like 'versioning_current_timestamp';
6+
show variables like 'versioning_current_timestamp';
77
select * from t;
88

9-
set vers_current_time = '2031-1-1 0:0:0';
10-
show variables like 'vers_current_time';
9+
set versioning_current_timestamp = '2031-1-1 0:0:0';
10+
show variables like 'versioning_current_timestamp';
1111
select * from t;
1212

13-
set vers_current_time = '2011-1-1 0:0:0';
14-
show variables like 'vers_current_time';
13+
set versioning_current_timestamp = '2011-1-1 0:0:0';
14+
show variables like 'versioning_current_timestamp';
1515
select * from t;
1616

17-
set vers_current_time = 'all';
18-
show variables like 'vers_current_time';
17+
set versioning_current_timestamp = 'all';
18+
show variables like 'versioning_current_timestamp';
1919
select * from t;
2020

2121
create view vt as select * from t;
@@ -26,59 +26,59 @@ select * from (select * from t) as tt;
2626

2727
# global
2828
--error ER_WRONG_VALUE_FOR_VAR
29-
set global vers_current_time= 'alley';
29+
set global versioning_current_timestamp= 'alley';
3030
--error ER_WRONG_VALUE_FOR_VAR
31-
set global vers_current_time= null;
31+
set global versioning_current_timestamp= null;
3232
--error ER_WRONG_TYPE_FOR_VAR
33-
set global vers_current_time= 1;
33+
set global versioning_current_timestamp= 1;
3434
--error ER_WRONG_TYPE_FOR_VAR
35-
set global vers_current_time= 1.1;
35+
set global versioning_current_timestamp= 1.1;
3636

3737
# session
3838
--error ER_WRONG_VALUE_FOR_VAR
39-
set vers_current_time= 'alley';
39+
set versioning_current_timestamp= 'alley';
4040
--error ER_WRONG_VALUE_FOR_VAR
41-
set vers_current_time= null;
41+
set versioning_current_timestamp= null;
4242
--error ER_WRONG_TYPE_FOR_VAR
43-
set vers_current_time= 1;
43+
set versioning_current_timestamp= 1;
4444
--error ER_WRONG_TYPE_FOR_VAR
45-
set vers_current_time= 1.1;
45+
set versioning_current_timestamp= 1.1;
4646

4747
# global
48-
set global vers_current_time= '1911-11-11 11:11:11.1111119';
49-
show global variables like 'vers_current_time';
48+
set global versioning_current_timestamp= '1911-11-11 11:11:11.1111119';
49+
show global variables like 'versioning_current_timestamp';
5050

51-
set global vers_current_time= '1900-01-01 00:00:00';
52-
show global variables like 'vers_current_time';
51+
set global versioning_current_timestamp= '1900-01-01 00:00:00';
52+
show global variables like 'versioning_current_timestamp';
5353

54-
set global vers_current_time= timestamp'1911-11-11 11:11:11.1111119';
55-
show global variables like 'vers_current_time';
54+
set global versioning_current_timestamp= timestamp'1911-11-11 11:11:11.1111119';
55+
show global variables like 'versioning_current_timestamp';
5656

5757
set @ts= timestamp'1900-01-01 00:00:00';
58-
set global vers_current_time= @ts;
59-
show global variables like 'vers_current_time';
58+
set global versioning_current_timestamp= @ts;
59+
show global variables like 'versioning_current_timestamp';
6060

6161
# session
62-
set vers_current_time= '1911-11-11 11:11:11.1111119';
63-
show variables like 'vers_current_time';
62+
set versioning_current_timestamp= '1911-11-11 11:11:11.1111119';
63+
show variables like 'versioning_current_timestamp';
6464

65-
set vers_current_time= '1900-01-01 00:00:00';
66-
show variables like 'vers_current_time';
65+
set versioning_current_timestamp= '1900-01-01 00:00:00';
66+
show variables like 'versioning_current_timestamp';
6767

68-
set vers_current_time= timestamp'1911-11-11 11:11:11.1111119';
69-
show variables like 'vers_current_time';
68+
set versioning_current_timestamp= timestamp'1911-11-11 11:11:11.1111119';
69+
show variables like 'versioning_current_timestamp';
7070

7171
set @ts= timestamp'1900-01-01 00:00:00';
72-
set vers_current_time= @ts;
73-
show variables like 'vers_current_time';
72+
set versioning_current_timestamp= @ts;
73+
show variables like 'versioning_current_timestamp';
7474

75-
set global vers_current_time= 'now';
76-
set vers_current_time= 'now';
75+
set global versioning_current_timestamp= 'now';
76+
set versioning_current_timestamp= 'now';
7777

78-
show variables where variable_name = "vers_hide";
78+
show variables where variable_name = "versioning_hide";
7979
select * from t for system_time all;
8080

81-
set vers_hide= AUTO;
81+
set versioning_hide= AUTO;
8282
select * from t;
8383
select * from t for system_time as of timestamp current_timestamp(6);
8484
--replace_regex /\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{6}/TIMESTAMP/
@@ -88,11 +88,11 @@ select * from t for system_time timestamp from '0-0-0' to current_timestamp(6);
8888
--replace_regex /\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{6}/TIMESTAMP/
8989
select * from t for system_time timestamp between '0-0-0' and current_timestamp(6);
9090

91-
set vers_hide= NEVER;
91+
set versioning_hide= NEVER;
9292
--replace_regex /\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{6}/TIMESTAMP/
9393
select * from t;
9494

95-
set vers_hide= FULL;
95+
set versioning_hide= FULL;
9696
create or replace table t (
9797
x int,
9898
st timestamp(6) generated always as row start,
@@ -108,4 +108,4 @@ select * from t;
108108
select * from t for system_time all;
109109

110110
drop table t;
111-
set vers_hide= IMPLICIT;
111+
set versioning_hide= IMPLICIT;

‎mysql-test/suite/versioning/t/truncate_history.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

‎mysql-test/suite/versioning/t/view.opt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--vers-hide=implicit
1+
--versioning-hide=implicit

0 commit comments

Comments
 (0)