Skip to content

M
mariadb
Commit b01237b9 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files
Options

field_conv.cc: 

  Additional fix for bug #29360.
parent 13844b25
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
sql/field_conv.cc
View file @ b01237b9
...@@ -795,6 +795,7 @@ int field_conv(Field *to,Field *from) ...@@ -795,6 +795,7 @@ int field_conv(Field *to,Field *from)
from->val_int() == 0) from->val_int() == 0)
{ {
((Field_enum *)(to))->store_type(0); ((Field_enum *)(to))->store_type(0);
return 0;
} }
else if ((from->result_type() == STRING_RESULT && else if ((from->result_type() == STRING_RESULT &&
(to->result_type() == STRING_RESULT || (to->result_type() == STRING_RESULT ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7