fixed brocken of client_test

fixed aggregate functions in PS (BUG#3360)

1 files changed, 2 insertions, 5 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index cbd1e9feffa..d654bec4f4e 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -991,14 +991,11 @@ public:
 
 /* Some usefull inline functions */
 
-inline Item *and_conds(THD *thd, Item *a, Item *b, TABLE_LIST *tables)
+inline Item *and_conds(Item *a, Item *b)
 {
   if (!b) return a;
   if (!a) return b;
-  Item *cond= new Item_cond_and(a,b);
-  if (cond)
-    cond->fix_fields(thd, tables, &cond);
-  return cond;
+  return new Item_cond_and(a, b);
 }
 
 Item *and_expressions(Item *a, Item *b, Item **org_item);