Merge

sql/item_strfunc.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
mysql-test/r/func_str.result:
  merge

sql/item_strfunc.cc

@@ -1906,6 +1906,7 @@ b1:        str->append((char)(num>>8));
 #endif
       str->append((char)num);
   }
+  str->set_charset(collation.collation);
   str->realloc(str->length());			// Add end 0 (for Purify)
   return str;
 }