← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/decimal.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 06:48:39 UTC
  • mfrom: (2114.5.2 timestamp)
  • Revision ID: brian@tangent.org-20110126064839-nfcmqoqu08x22pdo
Merge in time tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/decimal.cc
152
152
  if ((err= decimal_value.store(E_DEC_FATAL_ERROR &
153
153
                           ~(E_DEC_OVERFLOW | E_DEC_BAD_NUM),
154
154
                           from, length, charset_arg)) &&
155
 
      getTable()->in_use->abort_on_warning)
 
155
      getTable()->in_use->abortOnWarning())
156
156
  {
157
157
    /* Because "from" is not NUL-terminated and we use %s in the ER() */
158
158
    String from_as_str;