Update the test results back (were changed due to slightly different QEPs

produced by the optimizer, which was an error, which was detected and fixed)

mysql-test/r/subselect_sj2.result

@@ -150,7 +150,6 @@ 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
@@ -158,6 +157,7 @@ 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,7 +218,6 @@ 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
@@ -226,6 +225,7 @@ 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,7 +155,6 @@ 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
@@ -165,6 +164,7 @@ 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,7 +223,6 @@ 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
@@ -233,6 +232,7 @@ 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
-0
-3
-0
-0
-7
-7
 7
 9
-2
 9
 5
+2
+0
 0
+0
+3
+7
+7
 8
+0
 5
 EXPLAIN
 SELECT int_key FROM ot1