← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • 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.cc
30
30
  if (use_cached_value)
31
31
    return null_value ? 0 : &str_value;
32
32
  String *arg= args[0]->val_str(str);
33
 
  uint32_t dummy_errors;
 
33
  size_t dummy_errors;
34
34
  if (!arg)
35
35
  {
36
36
    null_value=1;