bzr push into mysql-6.0 branch (alik:2724 to 2725)

[Alexander Nozdrin]

 2725 Alexander Nozdrin	2009-02-24
      Fix default.conf
      modified:
        .bzr-mysql/default.conf

 2724 Alexander Nozdrin	2009-02-24 [merge]
      Pull from 6.0 main
      modified:
        configure.in

=== modified file 'mysql-test/r/join_cache.result'
--- a/mysql-test/r/join_cache.result	2009-02-12 00:02:09 +0000
+++ b/mysql-test/r/join_cache.result	2009-02-20 11:53:55 +0000
@@ -3704,15 +3704,15 @@ SELECT t1.a, t2.a, t3.a, t2.b, t3.b, t3.
 FROM (t1,t2) LEFT JOIN t3 ON (t1.a=t3.a AND t2.b=t3.b) 
 WHERE t1.a=t2.a;
 a	a	a	b	b	val
-2	2	2	30	30	0
-2	2	2	40	40	0
-2	2	2	50	50	0
-2	2	2	60	60	0
 1	1	NULL	10	NULL	NULL
 1	1	NULL	20	NULL	NULL
 1	1	NULL	30	NULL	NULL
 1	1	NULL	40	NULL	NULL
 1	1	NULL	50	NULL	NULL
[phone]
[phone]
[phone]
[phone]
 2	2	2	70	70	0
 2	2	2	80	80	0
 set join_buffer_size=default;

=== modified file 'mysql-test/r/subselect_sj2.result'
--- a/mysql-test/r/subselect_sj2.result	2008-12-22 19:03:25 +0000
+++ b/mysql-test/r/subselect_sj2.result	2009-02-19 11:24:51 +0000
@@ -75,6 +75,8 @@ explain select * from t3 where b in (sel
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Materialize; Scan
 1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	
+set @save_ecp= @@engine_condition_pushdown;
+set engine_condition_pushdown=1;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
 a	b	pk1	pk2
 0	0	0	0
@@ -91,6 +93,7 @@ a	b	pk1	pk2
 11	11	11	11
 12	12	12	12
 13	13	13	13
+set engine_condition_pushdown=@save_ecp;
 set join_buffer_size= @save_join_buffer_size;
 set max_heap_table_size= @save_max_heap_table_size;
 explain select * from t1 where a in (select b from t2);

=== modified file 'mysql-test/r/subselect_sj2_jcl6.result'
--- a/mysql-test/r/subselect_sj2_jcl6.result	2009-01-14 10:29:36 +0000
+++ b/mysql-test/r/subselect_sj2_jcl6.result	2009-02-21 13:19:42 +0000
@@ -79,6 +79,8 @@ explain select * from t3 where b in (sel
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Materialize; Scan
 1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	Using join buffer
+set @save_ecp= @@engine_condition_pushdown;
+set engine_condition_pushdown=1;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
 a	b	pk1	pk2
 0	0	0	0
@@ -95,6 +97,7 @@ a	b	pk1	pk2
 11	11	11	11
 12	12	12	12
 13	13	13	13
+set engine_condition_pushdown=@save_ecp;
 set join_buffer_size= @save_join_buffer_size;
 set max_heap_table_size= @save_max_heap_table_size;
 explain select * from t1 where a in (select b from t2);

=== modified file 'mysql-test/t/join_cache.test'
--- a/mysql-test/t/join_cache.test	2009-02-12 00:02:09 +0000
+++ b/mysql-test/t/join_cache.test	2009-02-19 10:50:48 +0000
@@ -1083,6 +1083,7 @@ SELECT t1.a, t2.a, t3.a, t2.b, t3.b, t3.
   FROM (t1,t2) LEFT JOIN t3 ON (t1.a=t3.a AND t2.b=t3.b) 
     WHERE t1.a=t2.a; 
 
+--sorted_result
 SELECT t1.a, t2.a, t3.a, t2.b, t3.b, t3.val 
   FROM (t1,t2) LEFT JOIN t3 ON (t1.a=t3.a AND t2.b=t3.b) 
     WHERE t1.a=t2.a; 

=== modified file 'mysql-test/t/subselect_sj2.test'
--- a/mysql-test/t/subselect_sj2.test	2008-07-10 16:02:38 +0000
+++ b/mysql-test/t/subselect_sj2.test	2009-02-19 11:24:51 +0000
@@ -62,7 +62,11 @@ insert into t3 select 
 from t0 A, t0 B where B.a <5;
 
 explain select * from t3 where b in (select a from t0);
+# Because of BUG#40154, run the next select w/o index condition pushdown:
+set @save_ecp= @@engine_condition_pushdown;
+set engine_condition_pushdown=1;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);
+set engine_condition_pushdown=@save_ecp;
 
 set join_buffer_size= @save_join_buffer_size;
 set max_heap_table_size= @save_max_heap_table_size;