field.cc:

Correction after manula merge.
This commit is contained in:
igor@rurik.mysql.com 2005-06-24 01:21:18 -07:00
parent abe8ec4be2
commit c3aa161c28

View file

@ -3317,7 +3317,7 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
}
if (error)
{
error= 1;
error= error != MY_ERRNO_EDOM ? 1 : 2;
set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
}
else if (from+len != end && table->in_use->count_cuted_fields &&