bk commit into 6.0 tree (timour:1.2724) BUG#32694

[timour]

Below is the list of changes that have just been committed into a local
6.0 repository of tkatchaounov. When tkatchaounov does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-10 18:24:46+02:00, timour@stripped +2 -0
  Adjusted test case to test BUG#32694 in 6.0.

  mysql-test/r/type_datetime.result@stripped, 2007-12-10 18:24:42+02:00, timour@stripped
+2 -0
    Adjusted test case to test BUG#32694 in 6.0.

  mysql-test/t/type_datetime.test@stripped, 2007-12-10 18:24:43+02:00, timour@stripped
+2 -1
    Adjusted test case to test BUG#32694 in 6.0.

diff -Nrup a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result
--- a/mysql-test/r/type_datetime.result	2007-12-10 11:48:49 +02:00
+++ b/mysql-test/r/type_datetime.result	2007-12-10 18:24:42 +02:00
@@ -509,6 +509,7 @@ create table t1 (id int(10) not null, cu
 create table t2 (id int(10) not null, cur_date date not null);
 insert into t1 (id, cur_date) values (1, '2007-04-25 18:30:22');
 insert into t2 (id, cur_date) values (1, '2007-04-25');
+set @@optimizer_switch=no_semijoin;
 explain extended
 select * from t1
 where id in (select id from t1 as x1 where (t1.cur_date is null));
@@ -559,6 +560,7 @@ Note	1003	select `test`.`t2`.`id` AS `id
 select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
 id	cur_date
+set @@optimizer_switch='';
 drop table t1,t2;
 End of 5.0 tests
 set @org_mode=@@sql_mode;
diff -Nrup a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test
--- a/mysql-test/t/type_datetime.test	2007-12-10 11:48:49 +02:00
+++ b/mysql-test/t/type_datetime.test	2007-12-10 18:24:43 +02:00
@@ -346,6 +346,7 @@ create table t2 (id int(10) not null, cu
 insert into t1 (id, cur_date) values (1, '2007-04-25 18:30:22');
 insert into t2 (id, cur_date) values (1, '2007-04-25');
 
+set @@optimizer_switch=no_semijoin;
 explain extended
 select * from t1
 where id in (select id from t1 as x1 where (t1.cur_date is null));
@@ -372,7 +373,7 @@ select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
 select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
-
+set @@optimizer_switch='';
 drop table t1,t2;
 
 --echo End of 5.0 tests