From b6e01cbba30f2e951b5dcae1be65fc79c58ab088 Mon Sep 17 00:00:00 2001
From: unknown <gshchepa/uchum@gleb.loc>
Date: Thu, 12 Jul 2007 00:55:40 +0500
Subject: [PATCH] field_conv.cc:   Additional fix for bug #29360.

sql/field_conv.cc:
  Additional fix for bug #29360.
---
 sql/field_conv.cc | 1 +
 1 file changed, 1 insertion(+)

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 ||