← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/int64.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/int64.cc
51
51
  ASSERT_COLUMN_MARKED_FOR_WRITE;
52
52
 
53
53
  tmp= cs->cset->strntoull10rnd(cs, from, len, false, &end,&error);
54
 
  if (error == MY_ERRNO_ERANGE)
 
54
  if (error == ERANGE)
55
55
  {
56
56
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
57
57
    error= 1;