← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Fix merge issues with 1.0 CC fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/str_conv.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems
 
4
 *  Copyright (C) 2008 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <drizzled/server_includes.h>
21
 
#include CSTDINT_H
 
20
#include <config.h>
 
21
 
22
22
#include <drizzled/function/str/str_conv.h>
23
23
 
 
24
namespace drizzled
 
25
{
 
26
 
24
27
String *Item_str_conv::val_str(String *str)
25
28
{
26
29
  assert(fixed == 1);
27
30
  String *res;
28
31
  if (!(res=args[0]->val_str(str)))
29
32
  {
30
 
    null_value=1; /* purecov: inspected */
31
 
    return 0; /* purecov: inspected */
 
33
    null_value=1;
 
34
    return 0;
32
35
  }
33
36
  null_value=0;
34
37
  if (multiply == 1)
69
72
  max_length= args[0]->max_length * multiply;
70
73
}
71
74
 
 
75
} /* namespace drizzled */