← 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: Monty Taylor
  • Date: 2009-09-22 23:50:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1184.
  • Revision ID: mordred@inaugust.com-20090922235012-i0a3bs91f6krqduc
Fixed multi_malloc.h include guard.
Added include guard checking script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/conv_charset.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/str/conv_charset.h>
23
23
 
24
 
namespace drizzled
25
 
{
26
 
 
27
24
String *Item_func_conv_charset::val_str(String *str)
28
25
{
29
26
  assert(fixed == 1);
30
27
  if (use_cached_value)
31
28
    return null_value ? 0 : &str_value;
32
29
  String *arg= args[0]->val_str(str);
33
 
  size_t dummy_errors;
 
30
  uint32_t dummy_errors;
34
31
  if (!arg)
35
32
  {
36
33
    null_value=1;
56
53
  str->append(')');
57
54
}
58
55
 
59
 
} /* namespace drizzled */