diff options
| author | unknown <igor@rurik.mysql.com> | 2004-02-19 17:12:31 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-02-19 17:12:31 -0800 |
| commit | b692e9c2154642dc8cf612d2a87cc8f5c047222f (patch) | |
| tree | c2ee3ed933ff64145dcb7482e2e5fedf61865516 /sql/sql_select.cc | |
| parent | efaf0f0dc54315ebfa7af7afe135737a8beb743a (diff) | |
| download | mariadb-git-b692e9c2154642dc8cf612d2a87cc8f5c047222f.tar.gz | |
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.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5b5cd44d277..36205effe71 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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) |