← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/str.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 02:13:21 UTC
  • mto: (2122.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2118.
  • Revision ID: brian@tangent.org-20110126021321-3vxltp6aianxs18a
Additional abstract around time (this also makes the abort_on_warnings in
session private).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/str.cc
137
137
  length= internal::my_gcvt(nr, internal::MY_GCVT_ARG_DOUBLE, local_char_length, buff, &error);
138
138
  if (error)
139
139
  {
140
 
    if (getTable()->in_use->abort_on_warning)
 
140
    if (getTable()->getSession()->really_abort_on_warning())
141
141
    {
142
142
      set_warning(DRIZZLE_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);
143
143
    }
199
199
  }
200
200
  *t= '\0';
201
201
  push_warning_printf(field->getTable()->in_use,
202
 
                      field->getTable()->in_use->abort_on_warning ?
 
202
                      field->getTable()->in_use->really_abort_on_warning() ?
203
203
                      DRIZZLE_ERROR::WARN_LEVEL_ERROR :
204
204
                      DRIZZLE_ERROR::WARN_LEVEL_WARN,
205
205
                      ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,