summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc1
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 ||