← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Stewart Smith
  • Date: 2010-03-18 12:01:34 UTC
  • mto: (1666.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: stewart@flamingspork.com-20100318120134-45fdnsw8g3j6c7oy
move RAND() into a plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
29
29
Item *Item_string::safe_charset_converter(const CHARSET_INFO * const tocs)
30
30
{
31
31
  Item_string *conv;
32
 
  size_t conv_errors;
 
32
  uint32_t conv_errors;
33
33
  char *ptr;
34
34
  String tmp, cstr, *ostr= val_str(&tmp);
35
35
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
57
57
Item *Item_static_string_func::safe_charset_converter(const CHARSET_INFO * const tocs)
58
58
{
59
59
  Item_string *conv;
60
 
  size_t conv_errors;
 
60
  uint32_t conv_errors;
61
61
  String tmp, cstr, *ostr= val_str(&tmp);
62
62
  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
63
63
  if (conv_errors ||