← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/conv_charset.h

  • Committer: Brian Aker
  • Date: 2010-11-08 18:24:58 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108182458-twv4hyix43ojno80
Merge in changes such that lock is now broken out into its own directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/conv_charset.h
40
40
    conv_charset= cs;
41
41
    if (cache_if_const && args[0]->const_item())
42
42
    {
43
 
      uint32_t errors= 0;
 
43
      size_t errors= 0;
44
44
      String tmp, *str= args[0]->val_str(&tmp);
45
45
      if (!str || str_value.copy(str->ptr(), str->length(),
46
46
                                 str->charset(), conv_charset, &errors))