item_cmpfunc.cc:
Temporarily fix for test failure ,. sql/item_cmpfunc.cc: Temporarily fix for test failure ,.
This commit is contained in:
parent
1bc2349ec6
commit
0912871d6a
@ -90,6 +90,13 @@ static bool convert_constant_item(Field *field, Item **item)
|
|||||||
bool Item_bool_func2::set_cmp_charset(CHARSET_INFO *cs1, enum coercion co1,
|
bool Item_bool_func2::set_cmp_charset(CHARSET_INFO *cs1, enum coercion co1,
|
||||||
CHARSET_INFO *cs2, enum coercion co2)
|
CHARSET_INFO *cs2, enum coercion co2)
|
||||||
{
|
{
|
||||||
|
if (cs1 == &my_charset_bin || cs2 == &my_charset_bin)
|
||||||
|
{
|
||||||
|
cmp_charset= &my_charset_bin;
|
||||||
|
coercibility= co1 > co2 ? co1 : co2;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!my_charset_same(cs1, cs2))
|
if (!my_charset_same(cs1, cs2))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user