← 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: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

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))