← 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: 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.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;