diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-24 01:21:18 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-24 01:21:18 -0700 |
| commit | a60233121f524fc326d90bff7dcbf08dbd1cc959 (patch) | |
| tree | a5e04fdbc4c25c5fb2a0da4a9b3a691b2cb9f206 /sql/field.cc | |
| parent | 61e7655c89e78dc243ff3495139038796165dcb8 (diff) | |
| download | mariadb-git-a60233121f524fc326d90bff7dcbf08dbd1cc959.tar.gz | |
field.cc:
Correction after manula merge.
sql/field.cc:
Correction after manula merge.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 81f695454ff..fb244de4275 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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 && |