diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-11 19:41:53 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-11 19:41:53 +0200 |
| commit | 32902dad006b68e2bdb855f9c2ea1910a9195c9c (patch) | |
| tree | 0ecde18d6ef311d09aac32edb48e35ecd8c8a815 /sql/item.cc | |
| parent | 80164ae9a08041e67c65460d9bb2a6b0e1aeb277 (diff) | |
| download | mariadb-git-32902dad006b68e2bdb855f9c2ea1910a9195c9c.tar.gz | |
Addendum to bug #46175 : use and check for the correct error values
when converting to a enumerated type.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index c967a1a0feb..df266434f72 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5157,7 +5157,7 @@ int Item::save_in_field(Field *field, bool no_conversions) field->set_notnull(); error=field->store(nr, unsigned_flag); } - return error ? error : (field->table->in_use->is_error() ? 2 : 0); + return error ? error : (field->table->in_use->is_error() ? 1 : 0); } |