Merge gleb.loc:/home/uchum/work/bk/5.0-opt

into gleb.loc:/home/uchum/work/bk/5.0-opt-29360

Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.0-opt-29360
b0496c89 · gshchepa/uchum@gleb.loc · 13513be6 · b01237b9 · b0496c89
Commit b0496c89 authored Jul 12, 2007 by gshchepa/uchum@gleb.loc
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/field_conv.cc sql/field_conv.cc +1 -0

No files found.
--- 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 ||