1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

sql_select.cc, item_cmpfunc.h:

After merge fix for collation.


sql/item_cmpfunc.h:
  After merge fix for collation.
sql/sql_select.cc:
  After merge fix for collation.
This commit is contained in:
unknown
2004-02-19 17:12:31 -08:00
parent efaf0f0dc5
commit b692e9c215
2 changed files with 8 additions and 0 deletions

View File

@ -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, &copyfl);
if (copyfl)