diff options
author | unknown <igor@rurik.mysql.com> | 2006-04-10 13:04:25 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2006-04-10 13:04:25 -0700 |
commit | 7d384e46333b892a3566e51514381a0963e9eeb1 (patch) | |
tree | 278a3c2660327eff7b54c23e87bf2761f9182195 /sql | |
parent | fc1a194ef2d50c59dbff9be704634c2e51eaf53e (diff) | |
parent | e536c8eca7eb528dfe8cfd5ca96d2772ccca2a86 (diff) | |
download | mariadb-git-7d384e46333b892a3566e51514381a0963e9eeb1.tar.gz |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 24075ac838d..6e1afd4ef09 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -55,8 +55,8 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems) bool all_constant= TRUE; /* If the first argument is a FIELD_ITEM, pull out the field. */ - if (items[0]->type() == Item::FIELD_ITEM) - field=((Item_field *)items[0])->field; + if (items[0]->real_item()->type() == Item::FIELD_ITEM) + field=((Item_field *)(items[0]->real_item()))->field; /* But if it can't be compared as a longlong, we don't really care. */ if (field && !field->can_be_compared_as_longlong()) field= NULL; |