Skip to content

Commit 0939bfc

Browse files
grooverdangrooverdan
committed
MDEV-19052 main.win postfix --view-protocol compat
Correct compatibility with view-protocol. Thanks Lena Startseva
1 parent 7788593 commit 0939bfc

File tree

3 files changed

+30
-36
lines changed

3 files changed

+30
-36
lines changed

‎mysql-test/main/win.result‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,47 +1276,44 @@ ERROR HY000: Integer is required for ROWS-type frame
12761276
#
12771277
select
12781278
count(*) over (order by c
1279-
range between unbounded preceding and current row)
1279+
range between unbounded preceding and current row) as r
12801280
from t1;
1281-
count(*) over (order by c
1282-
range between unbounded preceding and current row)
1281+
r
12831282
1
12841283
2
12851284
select
12861285
count(*) over (order by c
1287-
range between current row and unbounded following)
1286+
range between current row and unbounded following) as r
12881287
from t1;
1289-
count(*) over (order by c
1290-
range between current row and unbounded following)
1288+
r
12911289
2
12921290
1
12931291
select
12941292
count(*) over (order by c
1295-
range between unbounded preceding and unbounded following)
1293+
range between unbounded preceding and unbounded following) as r
12961294
from t1;
1297-
count(*) over (order by c
1298-
range between unbounded preceding and unbounded following)
1295+
r
12991296
2
13001297
2
13011298
create table t2 (a int, b varchar(5));
13021299
insert into t2 values (1,'a'), (2, 'b'), (3, 'c');
1303-
select sum(a) over (order by b range between unbounded preceding and current row) from t2;
1304-
sum(a) over (order by b range between unbounded preceding and current row)
1300+
select sum(a) over (order by b range between unbounded preceding and current row) as r from t2;
1301+
r
13051302
1
13061303
3
13071304
6
13081305
insert into t1 values (3,3,'goo');
13091306
insert into t1 values (3,1,'har');
13101307
insert into t1 values (1,4,'har');
1311-
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) from t1;
1312-
a bsum(b) over (order by a, b desc range between unbounded preceding and current row)
1308+
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) as r from t1;
1309+
a br
13131310
1 4 4
13141311
1 1 5
13151312
2 2 7
13161313
3 3 10
13171314
3 1 11
1318-
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) from t1;
1319-
a bsum(b) over (order by a desc, b range between unbounded preceding and current row)
1315+
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) as r from t1;
1316+
a br
13201317
3 1 1
13211318
3 3 4
13221319
2 2 6

‎mysql-test/main/win.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,31 +818,31 @@ from t1;
818818

819819
select
820820
count(*) over (order by c
821-
range between unbounded preceding and current row)
821+
range between unbounded preceding and current row) as r
822822
from t1;
823823

824824
select
825825
count(*) over (order by c
826-
range between current row and unbounded following)
826+
range between current row and unbounded following) as r
827827
from t1;
828828

829829
select
830830
count(*) over (order by c
831-
range between unbounded preceding and unbounded following)
831+
range between unbounded preceding and unbounded following) as r
832832
from t1;
833833

834834
create table t2 (a int, b varchar(5));
835835
insert into t2 values (1,'a'), (2, 'b'), (3, 'c');
836836

837-
select sum(a) over (order by b range between unbounded preceding and current row) from t2;
837+
select sum(a) over (order by b range between unbounded preceding and current row) as r from t2;
838838

839839
insert into t1 values (3,3,'goo');
840840
insert into t1 values (3,1,'har');
841841
insert into t1 values (1,4,'har');
842842

843-
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) from t1;
843+
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) as r from t1;
844844

845-
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) from t1;
845+
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) as r from t1;
846846

847847
drop table t2;
848848
delete from t1 where a >= 3 or b = 4;

‎mysql-test/suite/encryption/r/tempfiles_encrypted.result‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,47 +1282,44 @@ ERROR HY000: Integer is required for ROWS-type frame
12821282
#
12831283
select
12841284
count(*) over (order by c
1285-
range between unbounded preceding and current row)
1285+
range between unbounded preceding and current row) as r
12861286
from t1;
1287-
count(*) over (order by c
1288-
range between unbounded preceding and current row)
1287+
r
12891288
1
12901289
2
12911290
select
12921291
count(*) over (order by c
1293-
range between current row and unbounded following)
1292+
range between current row and unbounded following) as r
12941293
from t1;
1295-
count(*) over (order by c
1296-
range between current row and unbounded following)
1294+
r
12971295
2
12981296
1
12991297
select
13001298
count(*) over (order by c
1301-
range between unbounded preceding and unbounded following)
1299+
range between unbounded preceding and unbounded following) as r
13021300
from t1;
1303-
count(*) over (order by c
1304-
range between unbounded preceding and unbounded following)
1301+
r
13051302
2
13061303
2
13071304
create table t2 (a int, b varchar(5));
13081305
insert into t2 values (1,'a'), (2, 'b'), (3, 'c');
1309-
select sum(a) over (order by b range between unbounded preceding and current row) from t2;
1310-
sum(a) over (order by b range between unbounded preceding and current row)
1306+
select sum(a) over (order by b range between unbounded preceding and current row) as r from t2;
1307+
r
13111308
1
13121309
3
13131310
6
13141311
insert into t1 values (3,3,'goo');
13151312
insert into t1 values (3,1,'har');
13161313
insert into t1 values (1,4,'har');
1317-
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) from t1;
1318-
a bsum(b) over (order by a, b desc range between unbounded preceding and current row)
1314+
select a, b, sum(b) over (order by a, b desc range between unbounded preceding and current row) as r from t1;
1315+
a br
13191316
1 4 4
13201317
1 1 5
13211318
2 2 7
13221319
3 3 10
13231320
3 1 11
1324-
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) from t1;
1325-
a bsum(b) over (order by a desc, b range between unbounded preceding and current row)
1321+
select a, b, sum(b) over (order by a desc, b range between unbounded preceding and current row) as r from t1;
1322+
a br
13261323
3 1 1
13271324
3 3 4
13281325
2 2 6

0 commit comments

Comments
 (0)