diff options
| author | gshchepa/uchum@gleb.loc <> | 2007-07-12 00:55:40 +0500 |
|---|---|---|
| committer | gshchepa/uchum@gleb.loc <> | 2007-07-12 00:55:40 +0500 |
| commit | b01237b9cbd0917c09b8a7453dc9d2cfe16b1d92 (patch) | |
| tree | c0bfadf46bb6d8fd31e532045478393c12d64d3b /sql/field_conv.cc | |
| parent | 13844b2533862ba6c746e3233e7693a90162c9ea (diff) | |
| download | mariadb-git-b01237b9cbd0917c09b8a7453dc9d2cfe16b1d92.tar.gz | |
field_conv.cc:
Additional fix for bug #29360.
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 2df65b62de6..2705d4f617b 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -795,6 +795,7 @@ int field_conv(Field *to,Field *from) from->val_int() == 0) { ((Field_enum *)(to))->store_type(0); + return 0; } else if ((from->result_type() == STRING_RESULT && (to->result_type() == STRING_RESULT || |