after merge fix

sql/item_subselect.cc

@@ -161,13 +161,12 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex)
   DBUG_VOID_RETURN;
 }
 
-Item_maxmin_subselect::Item_maxmin_subselect(THD *thd,
-					     st_select_lex *select_lex,
+Item_maxmin_subselect::Item_maxmin_subselect(st_select_lex *select_lex,
 					     bool max)
   :Item_singlerow_subselect()
 {
   DBUG_ENTER("Item_maxmin_subselect::Item_maxmin_subselect");
-  init(thd, select_lex, new select_max_min_finder_subselect(this, max));
+  init(select_lex, new select_max_min_finder_subselect(this, max));
   max_columns= 1;
   maybe_null= 1;
   max_columns= 1;
@@ -542,14 +541,14 @@ Item_in_subselect::single_value_transformer(JOIN *join,
       {
 	DBUG_RETURN(RES_ERROR);
       }
-      subs= new Item_singlerow_subselect(thd, select_lex);
+      subs= new Item_singlerow_subselect(select_lex);
     }
     else
     {
       // remove LIMIT placed  by ALL/ANY subquery
       select_lex->master_unit()->global_parameters->select_limit=
 	HA_POS_ERROR;
-      subs= new Item_maxmin_subselect(thd, select_lex,
+      subs= new Item_maxmin_subselect(select_lex,
 				      (func == &Item_bool_func2::le_creator ||
 				       func == &Item_bool_func2::lt_creator));
     }

sql/item_subselect.h

@@ -158,7 +158,7 @@ public:
 class Item_maxmin_subselect: public Item_singlerow_subselect
 {
 public:
-  Item_maxmin_subselect(THD *thd, st_select_lex *select_lex, bool max);
+  Item_maxmin_subselect(st_select_lex *select_lex, bool max);
   Item_maxmin_subselect(Item_maxmin_subselect *item)
     :Item_singlerow_subselect(item) {}
 };