Skip to content

Commit cc6701a

Browse files
committed
Tests: vtmd, optimized, partition
1 parent 27b3642 commit cc6701a

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,61 +17,61 @@ a b b+0
1717
1 NULL NULL
1818
3 NULL NULL
1919
Warnings:
20-
Warning 4102 Attempt to read unversioned field `b` in historical query
21-
Warning 4102 Attempt to read unversioned field `b` in historical query
20+
Warning 4109 Attempt to read unversioned field `b` in historical query
21+
Warning 4109 Attempt to read unversioned field `b` in historical query
2222
select * from t for system_time as of timestamp now(6);
2323
a b
2424
1 NULL
2525
3 NULL
2626
Warnings:
27-
Warning 4102 Attempt to read unversioned field `b` in historical query
27+
Warning 4109 Attempt to read unversioned field `b` in historical query
2828
select count(*) from t group by b system_time as of timestamp now(6);
2929
count(*)
3030
2
3131
Warnings:
32-
Warning 4102 Attempt to read unversioned field `b` in historical query
32+
Warning 4109 Attempt to read unversioned field `b` in historical query
3333
select * from t for system_time as of timestamp now(6) order by b asc;
3434
a b
3535
1 NULL
3636
3 NULL
3737
Warnings:
38-
Warning 4102 Attempt to read unversioned field `b` in historical query
39-
Warning 4102 Attempt to read unversioned field `b` in historical query
38+
Warning 4109 Attempt to read unversioned field `b` in historical query
39+
Warning 4109 Attempt to read unversioned field `b` in historical query
4040
select * from t for system_time as of timestamp now(6) order by b desc;
4141
a b
4242
1 NULL
4343
3 NULL
4444
Warnings:
45-
Warning 4102 Attempt to read unversioned field `b` in historical query
46-
Warning 4102 Attempt to read unversioned field `b` in historical query
45+
Warning 4109 Attempt to read unversioned field `b` in historical query
46+
Warning 4109 Attempt to read unversioned field `b` in historical query
4747
select * from t group by a having a=2 system_time as of timestamp now(6);
4848
a b
4949
Warnings:
50-
Warning 4102 Attempt to read unversioned field `b` in historical query
50+
Warning 4109 Attempt to read unversioned field `b` in historical query
5151
select * from t group by b having b=2 system_time as of timestamp now(6);
5252
a b
5353
Warnings:
54-
Warning 4102 Attempt to read unversioned field `b` in historical query
55-
Warning 4102 Attempt to read unversioned field `b` in historical query
54+
Warning 4109 Attempt to read unversioned field `b` in historical query
55+
Warning 4109 Attempt to read unversioned field `b` in historical query
5656
select a from t where b=2 system_time as of timestamp now(6);
5757
a
5858
Warnings:
59-
Warning 4102 Attempt to read unversioned field `b` in historical query
59+
Warning 4109 Attempt to read unversioned field `b` in historical query
6060
select a from t where b=NULL system_time as of timestamp now(6);
6161
a
6262
Warnings:
63-
Warning 4102 Attempt to read unversioned field `b` in historical query
63+
Warning 4109 Attempt to read unversioned field `b` in historical query
6464
select a from t where b is NULL system_time as of timestamp now(6);
6565
a
6666
1
6767
3
6868
Warnings:
69-
Warning 4102 Attempt to read unversioned field `b` in historical query
69+
Warning 4109 Attempt to read unversioned field `b` in historical query
7070
select count(*), b from t group by b having b=NULL system_time as of timestamp now(6);
7171
count(*) b
7272
Warnings:
73-
Warning 4102 Attempt to read unversioned field `b` in historical query
74-
Warning 4102 Attempt to read unversioned field `b` in historical query
73+
Warning 4109 Attempt to read unversioned field `b` in historical query
74+
Warning 4109 Attempt to read unversioned field `b` in historical query
7575
select a, b from t;
7676
a b
7777
1 2
@@ -80,31 +80,31 @@ select count(*) from t for system_time as of timestamp now(6) group by b;
8080
count(*)
8181
2
8282
Warnings:
83-
Warning 4102 Attempt to read unversioned field `b` in historical query
83+
Warning 4109 Attempt to read unversioned field `b` in historical query
8484
select * from t for system_time as of timestamp now(6) group by b having b=2;
8585
a b
8686
Warnings:
87-
Warning 4102 Attempt to read unversioned field `b` in historical query
88-
Warning 4102 Attempt to read unversioned field `b` in historical query
87+
Warning 4109 Attempt to read unversioned field `b` in historical query
88+
Warning 4109 Attempt to read unversioned field `b` in historical query
8989
select a from t for system_time as of timestamp now(6) where b=2;
9090
a
9191
Warnings:
92-
Warning 4102 Attempt to read unversioned field `b` in historical query
92+
Warning 4109 Attempt to read unversioned field `b` in historical query
9393
select a from t for system_time as of timestamp now(6) where b=NULL;
9494
a
9595
Warnings:
96-
Warning 4102 Attempt to read unversioned field `b` in historical query
96+
Warning 4109 Attempt to read unversioned field `b` in historical query
9797
select a from t for system_time as of timestamp now(6) where b is NULL;
9898
a
9999
1
100100
3
101101
Warnings:
102-
Warning 4102 Attempt to read unversioned field `b` in historical query
102+
Warning 4109 Attempt to read unversioned field `b` in historical query
103103
select count(*), b from t for system_time as of timestamp now(6) group by b having b=NULL;
104104
count(*) b
105105
Warnings:
106-
Warning 4102 Attempt to read unversioned field `b` in historical query
107-
Warning 4102 Attempt to read unversioned field `b` in historical query
106+
Warning 4109 Attempt to read unversioned field `b` in historical query
107+
Warning 4109 Attempt to read unversioned field `b` in historical query
108108
create or replace table t (
109109
a int,
110110
b int not null without system versioning
@@ -115,12 +115,12 @@ a b
115115
1 NULL
116116
3 NULL
117117
Warnings:
118-
Warning 4102 Attempt to read unversioned field `b` in historical query
118+
Warning 4109 Attempt to read unversioned field `b` in historical query
119119
select * from t for system_time as of timestamp now(6) where b is NULL;
120120
a b
121121
1 NULL
122122
3 NULL
123123
Warnings:
124-
Warning 4102 Attempt to read unversioned field `b` in historical query
125-
Warning 4102 Attempt to read unversioned field `b` in historical query
124+
Warning 4109 Attempt to read unversioned field `b` in historical query
125+
Warning 4109 Attempt to read unversioned field `b` in historical query
126126
drop table t;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERS
147147
alter table t1 add partition (
148148
partition p1 versioning);
149149
Warnings:
150-
Warning 4105 Maybe missing parameters: no rotation condition for multiple `VERSIONING` partitions.
150+
Warning 4112 Maybe missing parameters: no rotation condition for multiple `VERSIONING` partitions.
151151
show create table t1;
152152
Table Create Table
153153
t1 CREATE TABLE `t1` (
@@ -290,7 +290,7 @@ x
290290
2
291291
delete from t1;
292292
Warnings:
293-
Note 4106 Switching from partition `p0` to `p1`
293+
Note 4113 Switching from partition `p0` to `p1`
294294
select * from t1 partition (p0) for system_time all;
295295
x
296296
1
@@ -300,7 +300,7 @@ x
300300
insert into t1 values (3);
301301
delete from t1;
302302
Warnings:
303-
Warning 4104 Using full partition `p1`, need more VERSIONING partitions!
303+
Warning 4111 Using full partition `p1`, need more VERSIONING partitions!
304304
select * from t1 partition (p1) for system_time all;
305305
x
306306
2
@@ -333,7 +333,7 @@ x
333333
insert into t1 values (4);
334334
delete from t1;
335335
Warnings:
336-
Note 4106 Switching from partition `p0` to `p1`
336+
Note 4113 Switching from partition `p0` to `p1`
337337
select * from t1 partition (p1) for system_time all;
338338
x
339339
4
@@ -355,8 +355,8 @@ x
355355
2
356356
delete from t1;
357357
Warnings:
358-
Note 4106 Switching from partition `p0` to `p1`
359-
Warning 4104 Using full partition `p1`, need more VERSIONING partitions!
358+
Note 4113 Switching from partition `p0` to `p1`
359+
Warning 4111 Using full partition `p1`, need more VERSIONING partitions!
360360
select * from t1 partition (p0sp0) for system_time all;
361361
x
362362
1

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ create or replace procedure show_tables()
4848
begin
4949
show tables;
5050
select table_name, table_schema from information_schema.tables
51-
where table_schema not in ('mysql', 'performance_schema', 'information_schema', 'mtr');
51+
where table_schema not in ('mysql', 'performance_schema', 'information_schema', 'mtr')
52+
order by table_name;
5253
end~~
5354
set versioning_alter_history= keep;
5455
create table t0 (z int) with system versioning;
@@ -150,7 +151,7 @@ x0_vtmd
150151
drop table x0_vtmd;
151152
rename table x0 to d0;
152153
Warnings:
153-
Warning 4115 `test.d0_vtmd` table already exists!
154+
Warning 4122 `test.d0_vtmd` table already exists!
154155
show tables;
155156
Tables_in_test
156157
d0
@@ -331,11 +332,11 @@ t3_TIMESTAMP_SUFFIX
331332
t3_TIMESTAMP_SUFFIX
332333
t3_vtmd
333334
table_name table_schema
334-
t1_TIMESTAMP_SUFFIX db1
335335
t0_TIMESTAMP_SUFFIX test
336336
t0_TIMESTAMP_SUFFIX test
337337
t0_TIMESTAMP_SUFFIX test
338338
t0_TIMESTAMP_SUFFIX test
339+
t1_TIMESTAMP_SUFFIX db1
339340
t2 test
340341
t2_vtmd test
341342
t3 test
@@ -353,7 +354,7 @@ t3_vtmd
353354
u0_vtmd
354355
u0_vtmd_vtmd
355356
Warnings:
356-
Warning 4115 Table `test.u0_vtmd` is not a VTMD table
357+
Warning 4122 Table `test.u0_vtmd` is not a VTMD table
357358
set versioning_alter_history= survive;
358359
create or replace table t (x int) with system versioning;
359360
select * from t for system_time all;

mysql-test/suite/versioning/t/vtmd.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ create or replace procedure show_tables()
6161
begin
6262
show tables;
6363
select table_name, table_schema from information_schema.tables
64-
where table_schema not in ('mysql', 'performance_schema', 'information_schema', 'mtr');
64+
where table_schema not in ('mysql', 'performance_schema', 'information_schema', 'mtr')
65+
order by table_name;
6566
end~~
6667
delimiter ;~~
6768

0 commit comments

Comments
 (0)