← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/int64_t.cc

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/int64_t.cc
37
37
  tmp= cs->cset->strntoull10rnd(cs,from,len,unsigned_flag,&end,&error);
38
38
  if (error == MY_ERRNO_ERANGE)
39
39
  {
40
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 
40
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
41
41
    error= 1;
42
42
  }
43
43
  else if (table->in_use->count_cuted_fields && 
94
94
      res=(int64_t) nr;
95
95
  }
96
96
  if (error)
97
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 
97
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
98
98
 
99
99
#ifdef WORDS_BIGENDIAN
100
100
  if (table->s->db_low_byte_first)
121
121
    if (unsigned_flag != unsigned_val)
122
122
    {
123
123
      nr= unsigned_flag ? (uint64_t) 0 : (uint64_t) INT64_MAX;
124
 
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 
124
      set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
125
125
      error= 1;
126
126
    }
127
127
  }