database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Adjusted test cases of the suite funcs_1.

Browse Source
This commit is contained in:
Igor Babaev
2011-12-16 08:05:14 -08:00
parent a4073c1990
commit 68dad67762
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/funcs_1/r/innodb_views.result
View File

@ -21081,6 +21081,8 @@ f59 f60 f61 a b
2 double 6 2 2 2 double 6 2 2
3 single-f3 6 NULL 3 3 single-f3 6 NULL 3
4 single 4 NULL 4 4 single 4 NULL 4
set @save_optimizer_switch=@@optimizer_switch;
set optimizer_switch='outer_join_with_cache=off';
Create or replace view test.v1 as Create or replace view test.v1 as
Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60, Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
t1.f61 t1_f61, t2.f61 t2_f61 t1.f61 t1_f61, t2.f61 t2_f61
@ -21111,6 +21113,7 @@ f59 f60 a b
1 single 1 NULL 1 single 1 NULL
2 double 2 2 2 double 2 2
3 single-f3 3 NULL 3 single-f3 3 NULL
set optimizer_switch=@save_optimizer_switch;
drop table t1, t2; drop table t1, t2;
drop view v1 ; drop view v1 ;
Use test; Use test;

3
mysql-test/suite/funcs_1/r/memory_views.result
View File

@ -21083,6 +21083,8 @@ f59 f60 f61 a b
2 double 6 2 2 2 double 6 2 2
3 single-f3 6 NULL 3 3 single-f3 6 NULL 3
4 single 4 NULL 4 4 single 4 NULL 4
set @save_optimizer_switch=@@optimizer_switch;
set optimizer_switch='outer_join_with_cache=off';
Create or replace view test.v1 as Create or replace view test.v1 as
Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60, Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
t1.f61 t1_f61, t2.f61 t2_f61 t1.f61 t1_f61, t2.f61 t2_f61
@ -21113,6 +21115,7 @@ f59 f60 a b
1 single 1 NULL 1 single 1 NULL
2 double 2 2 2 double 2 2
3 single-f3 3 NULL 3 single-f3 3 NULL
set optimizer_switch=@save_optimizer_switch;
drop table t1, t2; drop table t1, t2;
drop view v1 ; drop view v1 ;
Use test; Use test;

3
mysql-test/suite/funcs_1/r/myisam_views-big.result
View File

@ -22750,6 +22750,8 @@ f59 f60 f61 a b
2 double 6 2 2 2 double 6 2 2
3 single-f3 6 NULL 3 3 single-f3 6 NULL 3
4 single 4 NULL 4 4 single 4 NULL 4
set @save_optimizer_switch=@@optimizer_switch;
set optimizer_switch='outer_join_with_cache=off';
Create or replace view test.v1 as Create or replace view test.v1 as
Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60, Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
t1.f61 t1_f61, t2.f61 t2_f61 t1.f61 t1_f61, t2.f61 t2_f61
@ -22780,6 +22782,7 @@ f59 f60 a b
1 single 1 NULL 1 single 1 NULL
2 double 2 2 2 double 2 2
3 single-f3 3 NULL 3 single-f3 3 NULL
set optimizer_switch=@save_optimizer_switch;
drop table t1, t2; drop table t1, t2;
drop view v1 ; drop view v1 ;
Use test; Use test;

6
mysql-test/suite/funcs_1/views/views_master.inc
View File

@ -2541,6 +2541,10 @@ Select f59, f60, f61, t1.a, t2.b
FROM t2 natural left outer join t1; FROM t2 natural left outer join t1;
# Testcase 3.3.1.61 ; # Testcase 3.3.1.61 ;
set @save_optimizer_switch=@@optimizer_switch;
set optimizer_switch='outer_join_with_cache=off';
Create or replace view test.v1 as Create or replace view test.v1 as
Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60, Select t1.f59 t1_f59, t2.f59 t2_f59, t1.f60 t1_f60, t2.f60 t2_f60,
t1.f61 t1_f61, t2.f61 t2_f61 t1.f61 t1_f61, t2.f61 t2_f61
@ -2558,6 +2562,8 @@ Select * from v1 order by f59 desc;
Select f59, f60, a, b Select f59, f60, a, b
FROM t2 natural right outer join t1; FROM t2 natural right outer join t1;
set optimizer_switch=@save_optimizer_switch;
drop table t1, t2; drop table t1, t2;
drop view v1 ; drop view v1 ;