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

into  gleb.loc:/home/uchum/work/bk/5.0-opt-29360
This commit is contained in:
unknown 2007-07-12 00:58:23 +05:00
commit 95a526b87b

View file

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