field.cc:

Correction after manula merge.

field.cc:
Correction after manula merge.
c3aa161c · igor@rurik.mysql.com · abe8ec4b · c3aa161c
Commit c3aa161c authored Jun 24, 2005 by igor@rurik.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/field.cc sql/field.cc +1 -1

No files found.
--- 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 &&