diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-22 19:55:23 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-22 19:55:23 +0300 |
| commit | 72f1b329e16f8911cb445d11f2ad3367196f7737 (patch) | |
| tree | ed5debdb397566fdf03ab5090d8422ea3ebb69d8 /sql/item_sum.cc | |
| parent | d740f5c67567479149d2aea524b2463748f3b7ac (diff) | |
| parent | 012aab7d8bf7ae9c30751a6d5f666c7731ecfdf3 (diff) | |
| download | mariadb-git-72f1b329e16f8911cb445d11f2ad3367196f7737.tar.gz | |
Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790
into kaamos.(none):/data/src/opt/bug33049/my51-bug33790
mysql-test/r/view.result:
Auto merged
sql/item_sum.cc:
Auto merged
mysql-test/t/view.test:
Manual merge.
Diffstat (limited to 'sql/item_sum.cc')
| -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 881f472d766..9e4b8bdafa9 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -601,6 +601,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 |