~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/real.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
{
45
45
  assert(max_length >= pack_length());
46
46
#ifdef WORDS_BIGENDIAN
47
 
  if (low_byte_first != getTable()->s->db_low_byte_first)
 
47
  if (low_byte_first != getTable()->getShare()->db_low_byte_first)
48
48
  {
49
49
    const unsigned char *dptr= from + pack_length();
50
50
    while (dptr-- > from)
61
61
                   uint32_t param_data, bool low_byte_first)
62
62
{
63
63
#ifdef WORDS_BIGENDIAN
64
 
  if (low_byte_first != getTable()->s->db_low_byte_first)
 
64
  if (low_byte_first != getTable()->getShare()->db_low_byte_first)
65
65
  {
66
66
    const unsigned char *dptr= from + pack_length();
67
67
    while (dptr-- > from)
129
129
}
130
130
 
131
131
 
132
 
int Field_real::store_decimal(const my_decimal *dm)
 
132
int Field_real::store_decimal(const type::Decimal *dm)
133
133
{
134
134
  double dbl;
135
 
  my_decimal2double(E_DEC_FATAL_ERROR, dm, &dbl);
 
135
  class_decimal2double(E_DEC_FATAL_ERROR, dm, &dbl);
136
136
  return store(dbl);
137
137
}
138
138
 
139
 
my_decimal *Field_real::val_decimal(my_decimal *decimal_value)
 
139
type::Decimal *Field_real::val_decimal(type::Decimal *decimal_value)
140
140
{
141
141
  ASSERT_COLUMN_MARKED_FOR_READ;
142
142
 
143
 
  double2my_decimal(E_DEC_FATAL_ERROR, val_real(), decimal_value);
 
143
  double2_class_decimal(E_DEC_FATAL_ERROR, val_real(), decimal_value);
144
144
  return decimal_value;
145
145
}
146
146