← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

  • Committer: Brian Aker
  • Date: 2010-12-19 06:20:54 UTC
  • mfrom: (2005.1.1 bug673105)
  • Revision ID: brian@tangent.org-20101219062054-1kt0l3dxs4z2z8md
Merge Dave.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.cc
20
20
#include "config.h"
21
21
 
22
22
#include <drizzled/error.h>
23
 
#include <drizzled/field.h>
 
23
#include <drizzled/item/string.h>
24
24
#include <drizzled/item/hex_string.h>
25
 
#include <drizzled/item/string.h>
26
 
#include <drizzled/type/decimal.h>
27
25
 
28
26
#include <algorithm>
29
27
 
77
75
}
78
76
 
79
77
 
80
 
type::Decimal *Item_hex_string::val_decimal(type::Decimal *decimal_value)
 
78
my_decimal *Item_hex_string::val_decimal(my_decimal *decimal_value)
81
79
{
82
80
  // following assert is redundant, because fixed=1 assigned in constructor
83
81
  assert(fixed == 1);
84
82
  uint64_t value= (uint64_t)val_int();
85
 
  int2_class_decimal(E_DEC_FATAL_ERROR, value, true, decimal_value);
 
83
  int2my_decimal(E_DEC_FATAL_ERROR, value, true, decimal_value);
86
84
  return (decimal_value);
87
85
}
88
86