sql_udf.cc, protocol.cc:

  Less default_charset_info

sql/protocol.cc

@@ -508,7 +508,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
   List_iterator_fast<Item> it(*list);
   Item *item;
   char buff[80];
-  String tmp((char*) buff,sizeof(buff),default_charset_info);
+  String tmp((char*) buff,sizeof(buff),&my_charset_bin);
   Protocol_simple prot(thd);
   String *packet= prot.storage_packet();
   DBUG_ENTER("send_fields");
@@ -655,7 +655,7 @@ bool Protocol::store(const char *from)
 bool Protocol::store(I_List<i_string>* str_list)
 {
   char buf[256];
-  String tmp(buf, sizeof(buf), default_charset_info);
+  String tmp(buf, sizeof(buf), &my_charset_bin);
   uint32 len;
   I_List_iterator<i_string> it(*str_list);
   i_string* s;
@@ -794,7 +794,7 @@ bool Protocol_simple::store(Field *field)
   field_pos++;
 #endif
   char buff[MAX_FIELD_WIDTH];
-  String tmp(buff,sizeof(buff),default_charset_info);
+  String tmp(buff,sizeof(buff), &my_charset_bin);
   field->val_str(&tmp,&tmp);
   if (convert)
     return convert_str(tmp.ptr(), tmp.length());

sql/sql_udf.cc

@@ -431,9 +431,9 @@ int mysql_create_function(THD *thd,udf_func *udf)
     goto err;
 
   restore_record(table,2);		// Get default values for fields
-  table->field[0]->store(u_d->name.str, u_d->name.length, default_charset_info);
+  table->field[0]->store(u_d->name.str, u_d->name.length, system_charset_info);
   table->field[1]->store((longlong) u_d->returns);
-  table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), default_charset_info);
+  table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), system_charset_info);
   if (table->fields >= 4)			// If not old func format
     table->field[3]->store((longlong) u_d->type);
   error = table->file->write_row(table->record[0]);