diff options
| author | unknown <evgen@moonbone.local> | 2006-06-20 23:22:51 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-20 23:22:51 +0400 |
| commit | b6a416ff268037122f163f0511c69198b93b31f0 (patch) | |
| tree | 9a91b8ff5d19adfb24d11e2835adaa588b3aa68a /sql/item_cmpfunc.cc | |
| parent | 4d3803f0ed0122c5693aab6390feed903f2ca4dc (diff) | |
| parent | 3e7d68b11cd65dac087e2a634a8f007a295c6528 (diff) | |
| download | mariadb-git-b6a416ff268037122f163f0511c69198b93b31f0.tar.gz | |
Manually merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 6a27d08611e..80cf756d852 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -138,7 +138,8 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems) } continue; } - if ((res= items[i]->real_item()->type()) == Item::FIELD_ITEM) + if ((res= items[i]->real_item()->type()) == Item::FIELD_ITEM && + items[i]->result_type() != INT_RESULT) { field= ((Item_field *)items[i]->real_item())->field; break; |