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

sql_select.cc, item_cmpfunc.h:

Browse Source 
After merge fix for collation.
This commit is contained in:
igor@rurik.mysql.com
2004-02-19 17:12:31 -08:00
parent e720c2ce69
commit bae2554367
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_cmpfunc.h
View File

@ -1020,6 +1020,8 @@ public:
bool walk(Item_processor processor, byte *arg); bool walk(Item_processor processor, byte *arg);
Item *transform(Item_transformer transformer, byte *arg); Item *transform(Item_transformer transformer, byte *arg);
void print(String *str); void print(String *str);
CHARSET_INFO *compare_collation()
{ return fields.head()->collation.collation; }
}; };
class COND_EQUAL class COND_EQUAL

6
sql/sql_select.cc
View File

@ -4539,6 +4539,12 @@ static bool check_equality(Item *item, COND_EQUAL *cond_equal)
field_item->result_type() == const_item->result_type()) field_item->result_type() == const_item->result_type())
{ {
bool copyfl; 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, Item_equal *item_equal = find_item_equal(cond_equal,
field_item->field, &copyfl); field_item->field, &copyfl);
if (copyfl) if (copyfl)