Post-merge fixes part 5

mysql-test/r/subselect_sj2.result

@@ -150,6 +150,7 @@ a	mid(filler1, 1,10)	Z
 10	filler1234	1
 11	filler1234	1
 12	filler1234	1
+2	duplicate 	1
 13	filler1234	1
 14	filler1234	1
 15	filler1234	1
@@ -157,7 +158,6 @@ a	mid(filler1, 1,10)	Z
 17	filler1234	1
 18	filler1234	1
 19	filler1234	1
-2	duplicate 	1
 18	duplicate 	1
 explain select 
 a, mid(filler1, 1,10), length(filler1)=length(filler2) 
@@ -218,6 +218,7 @@ a	mid(filler1, 1,10)	Z
 10	filler1234	1
 11	filler1234	1
 12	filler1234	1
+2	duplicate 	1
 13	filler1234	1
 14	filler1234	1
 15	filler1234	1
@@ -225,7 +226,6 @@ a	mid(filler1, 1,10)	Z
 17	filler1234	1
 18	filler1234	1
 19	filler1234	1
-2	duplicate 	1
 18	duplicate 	1
 explain select 
 a, mid(filler1, 1,10), length(filler1)=length(filler2) 

mysql-test/r/subselect_sj2_jcl6.result

@@ -155,6 +155,7 @@ a	mid(filler1, 1,10)	Z
 8	filler1234	1
 9	filler1234	1
 10	filler1234	1
+2	duplicate 	1
 11	filler1234	1
 12	filler1234	1
 13	filler1234	1
@@ -164,7 +165,6 @@ a	mid(filler1, 1,10)	Z
 17	filler1234	1
 18	filler1234	1
 19	filler1234	1
-2	duplicate 	1
 18	duplicate 	1
 explain select 
 a, mid(filler1, 1,10), length(filler1)=length(filler2) 
@@ -223,6 +223,7 @@ a	mid(filler1, 1,10)	Z
 8	filler1234	1
 9	filler1234	1
 10	filler1234	1
+2	duplicate 	1
 11	filler1234	1
 12	filler1234	1
 13	filler1234	1
@@ -232,7 +233,6 @@ a	mid(filler1, 1,10)	Z
 17	filler1234	1
 18	filler1234	1
 19	filler1234	1
-2	duplicate 	1
 18	duplicate 	1
 explain select 
 a, mid(filler1, 1,10), length(filler1)=length(filler2) 

mysql-test/r/subselect_sj_jcl6.result

@@ -726,19 +726,19 @@ int_key
 0
 2
 0
-7
-9
-9
-5
-2
 0
+3
 0
 0
-3
 7
 7
-8
+7
+9
+2
+9
+5
 0
+8
 5
 EXPLAIN
 SELECT int_key FROM ot1

sql/sql_join_cache.cc

@@ -235,8 +235,13 @@ psergey-merge: was:
     }
   }
   start_tab= tab;
+  /*
   while (start_tab->bush_children && start_tab != join_tab)
     start_tab++;
+  */
+  if (start_tab->bush_children)
+    start_tab= start_tab->bush_children->start;
+
   tab= start_tab;
 
   //tables= join_tab-tab;