fixed bug IN subselect with ORDER

mysql-test/r/subselect.result

@@ -32,6 +32,9 @@ a
 1
 SELECT 1 FROM (SELECT (SELECT a));
 Unknown column 'a' in 'field list'
+SELECT * FROM (SELECT 1 as id) WHERE id IN (SELECT * FROM (SELECT 1 as id) ORDER BY id LIMIT 1);
+id
+1
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8;
 create table t1 (a int);
 create table t2 (a int, b int);

mysql-test/t/subselect.test

@@ -15,6 +15,8 @@ SELECT (SELECT 1), a;
 SELECT 1 as a FROM (SELECT 1) HAVING (SELECT a)=1;
 -- error 1054
 SELECT 1 FROM (SELECT (SELECT a));
+SELECT * FROM (SELECT 1 as id) WHERE id IN (SELECT * FROM (SELECT 1 as id) ORDER BY id LIMIT 1);
+
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8;
 create table t1 (a int);
 create table t2 (a int, b int);

sql/item_subselect.cc

@@ -300,15 +300,22 @@ void Item_in_subselect::single_value_transformer(st_select_lex *select_lex,
 
     Item *expr= new Item_outer_select_context_saver(left_expr);
 
-    if (sl->having || sl->with_sum_func || sl->group_list.first)
+    if (sl->having || sl->with_sum_func || sl->group_list.first ||
+	sl->order_list.first)
     {
       sl->item_list.push_back(item);
       item= (*func)(expr, new Item_ref(sl->item_list.head_ref(),
 					    0, (char*)"<result>"));
-      if (sl->having)
-	sl->having= new Item_cond_and(sl->having, item);
+      if (sl->having || sl->with_sum_func || sl->group_list.first)
+	if (sl->having)
+	  sl->having= new Item_cond_and(sl->having, item);
+	else
+	  sl->having= item;
       else
-	sl->having= item;
+	if (sl->where)
+	  sl->where= new Item_cond_and(sl->having, item);
+	else
+	  sl->where= item;
     }
     else
     {