← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/int.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/int.cc
18
18
 */
19
19
 
20
20
#include "config.h"
 
21
 
 
22
#include <drizzled/charset_info.h>
 
23
#include <drizzled/field.h>
 
24
#include <drizzled/internal/m_string.h>
21
25
#include <drizzled/item/int.h>
22
 
#include "drizzled/internal/m_string.h"
23
26
 
24
27
namespace drizzled
25
28
{
40
43
  fixed= 1;
41
44
}
42
45
 
43
 
my_decimal *Item_int::val_decimal(my_decimal *decimal_value)
 
46
type::Decimal *Item_int::val_decimal(type::Decimal *decimal_value)
44
47
{
45
 
  int2my_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
 
48
  int2_class_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
46
49
  return decimal_value;
47
50
}
48
51