← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/set.cc

Merged in remove-include-dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/set.cc
64
64
        tmp > (uint64_t) (((int64_t) 1 << typelib->count) - (int64_t) 1))
65
65
    {
66
66
      tmp=0;      
67
 
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
 
67
      set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
68
68
    }
69
69
  }
70
70
  else if (got_warning)
71
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
 
71
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
72
72
  store_type(tmp);
73
73
  return err;
74
74
}
82
82
  if ((uint64_t) nr > max_nr)
83
83
  {
84
84
    nr&= max_nr;
85
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1);
 
85
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
86
86
    error=1;
87
87
  }
88
88
  store_type((uint64_t) nr);