merge

sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 5 insertions, 3 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 9cb1df80e97..450f102e4f3 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -194,13 +194,13 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
     max_length=float_length(decimals);
   }else
   {
-    cmp_charset= item->charset();
+    cmp_charset= item->collation.collation;
     max_length=item->max_length;
   }
   decimals=item->decimals;
   maybe_null=item->maybe_null;
   unsigned_flag=item->unsigned_flag;
-  set_charset(item->charset());
+  collation.set(item->collation);
   result_field=0;
   null_value=1;
   fix_length_and_dec();
@@ -1024,7 +1024,9 @@ int simple_str_key_cmp(void* arg, byte* key1, byte* key2)
   Item_sum_count_distinct* item = (Item_sum_count_distinct*)arg;
   CHARSET_INFO *cs=item->key_charset;
   uint len=item->key_length;
-  return my_strnncoll(cs, (const uchar*) key1, len, (const uchar*) key2, len);
+  return cs->coll->strnncollsp(cs, 
+			       (const uchar*) key1, len, 
+			       (const uchar*) key2, len);
 }
 
 /*