← 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: Vijay Samuel
  • Date: 2010-08-04 17:46:49 UTC
  • mto: (1685.1.7 build)
  • mto: This revision was merged to the branch mainline in revision 1688.
  • Revision ID: vijay@vijay-20100804174649-ed61v9usifb9zujc
Merge refactored command line for tests/resolve_stack_dump`

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
 
  size_t dummy_errors;
 
33
  uint32_t dummy_errors;
34
34
  if (!arg)
35
35
  {
36
36
    null_value=1;