set_var.cc, sql_table.cc, handler.cc, field.cc:

  Less default_charset_info

sql/field.cc

@@ -4549,7 +4549,7 @@ void Field_geom::set_key_image(char *buff,uint length,CHARSET_INFO *cs)
 
 void Field_geom::sql_type(String &res) const
 {
-  res.set("geometry", 8, default_charset_info);
+  res.set("geometry", 8, &my_charset_latin1);
 }
 
 int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length)

sql/handler.cc

@@ -689,7 +689,7 @@ void handler::print_error(int error, myf errflag)
     {
       /* Write the dupplicated key in the error message */
       char key[MAX_KEY_LENGTH];
-      String str(key,sizeof(key),default_charset_info);
+      String str(key,sizeof(key),system_charset_info);
       key_unpack(&str,table,(uint) key_nr);
       uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY));
       if (str.length() >= max_length)

sql/set_var.cc

@@ -1074,7 +1074,7 @@ byte *sys_var_thd_sql_mode::value_ptr(THD *thd, enum_var_type type)
 {
   ulong val;
   char buff[256];
-  String tmp(buff, sizeof(buff), default_charset_info);
+  String tmp(buff, sizeof(buff), &my_charset_latin1);
   my_bool found= 0;
 
   tmp.length(0);

sql/sql_table.cc

@@ -247,7 +247,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
     {
       if (wrong_tables.length())
 	wrong_tables.append(',');
-      wrong_tables.append(String(table->real_name,default_charset_info));
+      wrong_tables.append(String(table->real_name,system_charset_info));
     }
   }
   thd->tmp_table_used= tmp_table_deleted;