mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
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:
commit
95a526b87b
1 changed files with 1 additions and 0 deletions
|
@ -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 ||
|
||||
|
|
Loading…
Reference in a new issue