← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/decimal.cc

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/decimal.cc
50
50
  {
51
51
    precision= class_decimal_length_to_precision(len_arg, dec_arg, false);
52
52
    set_if_smaller(precision, (uint32_t)DECIMAL_MAX_PRECISION);
53
 
    assert((precision <= DECIMAL_MAX_PRECISION) &&
54
 
           (dec <= DECIMAL_MAX_SCALE));
 
53
    assert((precision <= DECIMAL_MAX_PRECISION) && (dec <= DECIMAL_MAX_SCALE));
55
54
    bin_size= class_decimal_get_binary_size(precision, dec);
56
55
  }
57
56
 
304
303
 
305
304
  ASSERT_COLUMN_MARKED_FOR_READ;
306
305
 
307
 
  uint32_t fixed_precision= decimal_precision ? precision : 0;
308
 
  class_decimal2string(E_DEC_FATAL_ERROR, val_decimal(&decimal_value),
309
 
                    fixed_precision, dec, '0', val_buffer);
 
306
  class_decimal2string(val_decimal(&decimal_value),
 
307
                       dec, val_buffer);
310
308
  return val_buffer;
311
309
}
312
310