diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
tree | f9d0655a0d901b87f918a736741144b502cba3f6 /mysql-test/suite/funcs_1/r | |
parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz |
5.3 merge
Diffstat (limited to 'mysql-test/suite/funcs_1/r')
-rw-r--r-- | mysql-test/suite/funcs_1/r/innodb_views.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/funcs_1/r/memory_views.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/funcs_1/r/myisam_views-big.result | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index e2bcd1f5047..d9cd0f1e7f8 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -21082,6 +21082,8 @@ f59 f60 f61 a b 2 double 6 2 2 3 single-f3 6 NULL 3 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 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 @@ -21112,6 +21114,7 @@ f59 f60 a b 1 single 1 NULL 2 double 2 2 3 single-f3 3 NULL +set optimizer_switch=@save_optimizer_switch; drop table t1, t2; drop view v1 ; Use test; diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result index c93febe8cdf..864cbb93b29 100644 --- a/mysql-test/suite/funcs_1/r/memory_views.result +++ b/mysql-test/suite/funcs_1/r/memory_views.result @@ -21084,6 +21084,8 @@ f59 f60 f61 a b 2 double 6 2 2 3 single-f3 6 NULL 3 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 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 @@ -21114,6 +21116,7 @@ f59 f60 a b 1 single 1 NULL 2 double 2 2 3 single-f3 3 NULL +set optimizer_switch=@save_optimizer_switch; drop table t1, t2; drop view v1 ; Use test; diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result index b4c04c80a13..f4025dfef2a 100644 --- a/mysql-test/suite/funcs_1/r/myisam_views-big.result +++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result @@ -22751,6 +22751,8 @@ f59 f60 f61 a b 2 double 6 2 2 3 single-f3 6 NULL 3 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 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 @@ -22781,6 +22783,7 @@ f59 f60 a b 1 single 1 NULL 2 double 2 2 3 single-f3 3 NULL +set optimizer_switch=@save_optimizer_switch; drop table t1, t2; drop view v1 ; Use test; |