diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-22 21:25:51 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-22 21:25:51 +0300 |
| commit | 30de8b723711a46cd108e77d655bcb2323db0ff2 (patch) | |
| tree | 78b3e17127604c911512cc787c0cf443a99f1f03 /sql | |
| parent | e1378d1624945fabc61f90621d18d9402ca50c77 (diff) | |
| parent | 72f1b329e16f8911cb445d11f2ad3367196f7737 (diff) | |
| download | mariadb-git-30de8b723711a46cd108e77d655bcb2323db0ff2.tar.gz | |
Merge kaamos.(none):/data/src/opt/bug33049/my51-bug33790
into kaamos.(none):/data/src/opt/mysql-5.1-opt
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 27b964a9e15..d7b945cbd50 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -600,6 +600,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref) result_field=0; null_value=1; fix_length_and_dec(); + item= item->real_item(); if (item->type() == Item::FIELD_ITEM) hybrid_field_type= ((Item_field*) item)->field->type(); else |