← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 06:45:42 UTC
  • mto: (2122.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2118.
  • Revision ID: brian@tangent.org-20110126064542-87816j4xjinz95ha
Just  remove second ecapsulated method call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
1207
1207
{
1208
1208
  Session *session= (getTable() and getTable()->getSession()) ? getTable()->getSession() : current_session;
1209
1209
 
1210
 
  if ((session->really_abort_on_warning() &&
 
1210
  if ((session->abortOnWarning() and
1211
1211
       level >= DRIZZLE_ERROR::WARN_LEVEL_WARN) ||
1212
1212
      set_warning(level, code, cuted_increment))
1213
1213
    make_truncated_value_warning(session, level, str, str_length, ts_type,
1222
1222
{
1223
1223
  Session *session= (getTable() and getTable()->getSession()) ? getTable()->getSession() : current_session;
1224
1224
 
1225
 
  if (session->really_abort_on_warning() ||
 
1225
  if (session->abortOnWarning() or
1226
1226
      set_warning(level, code, cuted_increment))
1227
1227
  {
1228
1228
    char str_nr[22];
1239
1239
{
1240
1240
  Session *session= (getTable() and getTable()->getSession()) ? getTable()->getSession() : current_session;
1241
1241
 
1242
 
  if (session->really_abort_on_warning() ||
 
1242
  if (session->abortOnWarning() or
1243
1243
      set_warning(level, code, 1))
1244
1244
  {
1245
1245
    /* DBL_DIG is enough to print '-[digits].E+###' */