Skip to content

Commit 6fdc779

Browse files
committed
More result sorting in gcol_view test
Conflicts: mysql-test/suite/gcol_ndb/r/gcol_view_ndb.result mysql-test/suite/gcol_ndb/t/gcol_ndb_record_layout.test
1 parent 25dec10 commit 6fdc779

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

mysql-test/suite/gcol/inc/gcol_view.inc

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ create table t1 (a int not null,
5656
c int generated always as (-a) stored);
5757
insert into t1 (a) values (1), (2), (3), (1), (2), (3);
5858
create view v1 as select distinct b from t1;
59+
--sorted_result
5960
select * from v1;
6061
--replace_column 10 X
6162
explain select * from v1;
@@ -122,9 +123,11 @@ create table t1 (a int,
122123
primary key(a));
123124
insert into t1 (a) values (1), (2), (3);
124125
create view v1 (x,y,z) as select a,b,c from t1 where b < -1;
126+
--sorted_result
125127
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.b= v1.y);
126128
drop view v1;
127129
create view v1 (x,y,z) as select a,b,c from t1 where c < -1;
130+
--sorted_result
128131
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.c= v1.z);
129132
drop view v1;
130133
drop table t1;

mysql-test/suite/gcol/r/gcol_view_innodb.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@ insert into t1 (a) values (1), (2), (3);
169169
create view v1 (x,y,z) as select a,b,c from t1 where b < -1;
170170
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.b= v1.y);
171171
a x y z
172+
1 NULL NULL NULL
172173
2 2 -2 -2
173174
3 3 -3 -3
174-
1 NULL NULL NULL
175175
drop view v1;
176176
create view v1 (x,y,z) as select a,b,c from t1 where c < -1;
177177
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.c= v1.z);
178178
a x y z
179+
1 NULL NULL NULL
179180
2 2 -2 -2
180181
3 3 -3 -3
181-
1 NULL NULL NULL
182182
drop view v1;
183183
drop table t1;
184184
create table t1 (a1 int,

mysql-test/suite/gcol/r/gcol_view_myisam.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@ insert into t1 (a) values (1), (2), (3);
169169
create view v1 (x,y,z) as select a,b,c from t1 where b < -1;
170170
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.b= v1.y);
171171
a x y z
172+
1 NULL NULL NULL
172173
2 2 -2 -2
173174
3 3 -3 -3
174-
1 NULL NULL NULL
175175
drop view v1;
176176
create view v1 (x,y,z) as select a,b,c from t1 where c < -1;
177177
select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.c= v1.z);
178178
a x y z
179+
1 NULL NULL NULL
179180
2 2 -2 -2
180181
3 3 -3 -3
181-
1 NULL NULL NULL
182182
drop view v1;
183183
drop table t1;
184184
create table t1 (a1 int,

0 commit comments

Comments
 (0)