diff options
author | unknown <igor@rurik.mysql.com> | 2005-07-01 03:50:48 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-07-01 03:50:48 -0700 |
commit | 7dad490f36d2244198a825f8256914d79930a6f7 (patch) | |
tree | 16bb0523b2d3a0906170890e3b36f0c632a34add /sql/item.h | |
parent | 497b88652bf1529e62ae31c6c7151f5966435504 (diff) | |
parent | 66b4354a84800dd55c385d331884b16e9e5aa74b (diff) | |
download | mariadb-git-7dad490f36d2244198a825f8256914d79930a6f7.tar.gz |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/view.result:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 22641b8edd4..d5d4edb84d5 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1440,7 +1440,10 @@ public: :Item_ident(thd, item), result_field(item->result_field), ref(item->ref) {} enum Type type() const { return REF_ITEM; } bool eq(const Item *item, bool binary_cmp) const - { return ref && (*ref)->eq(item, binary_cmp); } + { + Item *it= ((Item *) item)->real_item(); + return ref && (*ref)->eq(it, binary_cmp); + } double val_real(); longlong val_int(); my_decimal *val_decimal(my_decimal *); |