mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
sql_select.cc, item_cmpfunc.h:
After merge fix for collation.
This commit is contained in:
@ -4539,6 +4539,12 @@ static bool check_equality(Item *item, COND_EQUAL *cond_equal)
|
||||
field_item->result_type() == const_item->result_type())
|
||||
{
|
||||
bool copyfl;
|
||||
|
||||
if (field_item->result_type() == STRING_RESULT &&
|
||||
((Field_str *) field_item)->charset() !=
|
||||
((Item_cond *) item)->compare_collation())
|
||||
return FALSE;
|
||||
|
||||
Item_equal *item_equal = find_item_equal(cond_equal,
|
||||
field_item->field, ©fl);
|
||||
if (copyfl)
|
||||
|
Reference in New Issue
Block a user