← 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: Mark Atwood
  • Date: 2011-05-09 00:03:05 UTC
  • mfrom: (2281.4.17 prune2)
  • Revision ID: me@mark.atwood.name-20110509000305-dilr9ms7n7p1dmnk
merge lp:~olafvdspek/drizzle/prune remove tztime

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/conv_charset.cc
21
21
 
22
22
#include <drizzled/function/str/conv_charset.h>
23
23
 
24
 
namespace drizzled
25
 
{
 
24
namespace drizzled {
26
25
 
27
26
String *Item_func_conv_charset::val_str(String *str)
28
27
{
36
35
    null_value=1;
37
36
    return 0;
38
37
  }
39
 
  null_value= str_value.copy(arg->ptr(),arg->length(),arg->charset(),
40
 
                             conv_charset, &dummy_errors);
 
38
  null_value= false;
 
39
  str_value.copy(arg->ptr(),arg->length(),arg->charset(), conv_charset, &dummy_errors);
41
40
  return null_value ? 0 : check_well_formed_result(&str_value);
42
41
}
43
42