← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_strfunc.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_strfunc.cc
2102
2102
  const CHARSET_INFO * const cs= args[0]->collation.collation; 
2103
2103
  null_value= 0;
2104
2104
  str->copy(cs->csname, strlen(cs->csname),
2105
 
            &my_charset_latin1, collation.collation, &dummy_errors);
 
2105
            &my_charset_utf8_general_ci, collation.collation, &dummy_errors);
2106
2106
  return str;
2107
2107
}
2108
2108
 
2114
2114
 
2115
2115
  null_value= 0;
2116
2116
  str->copy(cs->name, strlen(cs->name),
2117
 
            &my_charset_latin1, collation.collation, &dummy_errors);
 
2117
            &my_charset_utf8_general_ci, collation.collation, &dummy_errors);
2118
2118
  return str;
2119
2119
}
2120
2120