diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-08-02 15:27:47 -0400 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-08-02 15:27:47 -0400 |
| commit | 9eea112d9dd42e47a6d21869d34169fb58323f0d (patch) | |
| tree | c3c53cd8413b3030c9f2837b374f3db5ad512a70 /sql/field.cc | |
| parent | 21c55af5a103bcd3133c28073a7cd6e09d0521e3 (diff) | |
| parent | ec73a9b0a759478e070da9a7030ac85136fd3e5b (diff) | |
| download | mariadb-git-9eea112d9dd42e47a6d21869d34169fb58323f0d.tar.gz | |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Merge with 5.1 main.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 49433deca74..48339f2415f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8085,8 +8085,11 @@ int Field_enum::store(longlong nr, bool unsigned_val) if ((ulonglong) nr > typelib->count || nr == 0) { set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED, 1); - nr=0; - error=1; + if (nr != 0 || table->in_use->count_cuted_fields) + { + nr= 0; + error= 1; + } } store_type((ulonglong) (uint) nr); return error; |