5.3 merge

3 files changed, 13 insertions, 1 deletions

diff --git a/mysql-test/suite/vcol/inc/vcol_keys.inc b/mysql-test/suite/vcol/inc/vcol_keys.inc
index bba58363a81..6d859a4b0c3 100644
--- a/mysql-test/suite/vcol/inc/vcol_keys.inc
+++ b/mysql-test/suite/vcol/inc/vcol_keys.inc
@@ -98,7 +98,7 @@ if (!$skip_spatial_index_check)
   --error ER_SPATIAL_CANT_HAVE_NULL
   create table t1 (a int, b geometry as (a+1) persistent, spatial index (b));
   create table t1 (a int, b int as (a+1) persistent);
-  --error ER_SPATIAL_MUST_HAVE_GEOM_COL
+  --error ER_WRONG_ARGUMENTS
   alter table t1 add spatial index (b);
   drop table t1;
 }
diff --git a/mysql-test/suite/vcol/inc/vcol_select.inc b/mysql-test/suite/vcol/inc/vcol_select.inc
index 28c3416a55a..0641e14564a 100644
--- a/mysql-test/suite/vcol/inc/vcol_select.inc
+++ b/mysql-test/suite/vcol/inc/vcol_select.inc
@@ -84,10 +84,16 @@ eval $s;
 eval explain $s;
 
 --echo # select_type=DERIVED, type=system
+
+set @tmp_optimizer_switch=@@optimizer_switch;
+set optimizer_switch='derived_merge=off,derived_with_keys=off';
+
 let $s = select * from (select a,b,c from t1) as t11;
 eval $s;
 eval explain $s;
 
+set optimizer_switch=@tmp_optimizer_switch;
+
 --echo ###
 --echo ### Using aggregate functions with/without DISTINCT
 --echo ###
diff --git a/mysql-test/suite/vcol/inc/vcol_view.inc b/mysql-test/suite/vcol/inc/vcol_view.inc
index 64149a7bb31..abbeda60b75 100644
--- a/mysql-test/suite/vcol/inc/vcol_view.inc
+++ b/mysql-test/suite/vcol/inc/vcol_view.inc
@@ -106,6 +106,10 @@ drop view v1;
 #
 # outer join based on VIEW with WHERE clause
 #
+
+SET @save_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch='outer_join_with_cache=off';
+
 create table t1 (a int, 
 		 b int as (-a),
 		 c int as (-a) persistent,
@@ -119,6 +123,8 @@ select t1.a, v1.x, v1.y, v1.z from t1 left join v1 on (t1.c= v1.z);
 drop view v1;
 drop table t1;
 
+SET optimizer_switch=@save_optimizer_switch;
+
 #
 # VIEW built over UNION
 #