diff options
| author | unknown <hf@deer.(none)> | 2004-03-23 13:09:50 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-03-23 13:09:50 +0400 |
| commit | b02e83becf986b386acffc204bc4fde41caffc48 (patch) | |
| tree | c3bbcc4238d692985e74dd0d56d5c4020c126797 /sql/item.cc | |
| parent | a0dce8c864bce640690847c5600b3d233508d4a9 (diff) | |
| parent | a25455eea533974a2106be75605ca3ee8377da76 (diff) | |
| download | mariadb-git-b02e83becf986b386acffc204bc4fde41caffc48.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3188
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index faacf49fcc3..124310b68d5 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -456,9 +456,8 @@ bool Item_field::eq(const Item *item, bool binary_cmp) const (!my_strcasecmp(table_alias_charset, item_field->table_name, table_name) && (!item_field->db_name || - (item_field->db_name && !my_strcasecmp(table_alias_charset, - item_field->db_name, - db_name)))))); + (item_field->db_name && !strcmp(item_field->db_name, + db_name)))))); } |