← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

  • Committer: Brian Aker
  • Date: 2011-01-25 07:22:15 UTC
  • mfrom: (2109.1.7 drizzle-build)
  • Revision ID: brian@tangent.org-20110125072215-567z6uzy5vdvn4va
Merge in build/timestamp patches/fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
165
165
}
166
166
 
167
167
 
168
 
my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value)
 
168
type::Decimal *Field_varstring::val_decimal(type::Decimal *decimal_value)
169
169
{
170
170
  uint32_t length;
171
171
 
173
173
 
174
174
  length= length_bytes == 1 ? (uint32_t) *ptr : uint2korr(ptr);
175
175
 
176
 
  str2my_decimal(E_DEC_FATAL_ERROR, (char*) ptr+length_bytes, length,
177
 
                 charset(), decimal_value);
 
176
  decimal_value->store(E_DEC_FATAL_ERROR, (char*) ptr+length_bytes, length, charset());
 
177
 
178
178
  return decimal_value;
179
179
}
180
180