diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-12-22 14:38:33 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-12-22 14:38:33 +0400 |
| commit | c0bd23ddbfaec9a7d1623e521d2c2c25ecad3336 (patch) | |
| tree | 774e083a9f60f3802b6df6ec55229799d5594c2d /sql/item_func.cc | |
| parent | df357ed5146a24e4c859089a4d4d8586d1a9f7b0 (diff) | |
| parent | 081bcb3b8bc861bc5609a4ce92c8eb3528ffc078 (diff) | |
| download | mariadb-git-c0bd23ddbfaec9a7d1623e521d2c2c25ecad3336.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 977a0de39af..845654c1881 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -606,7 +606,7 @@ void Item_func::signal_divide_by_null() Item *Item_func::get_tmp_table_item(THD *thd) { - if (!with_sum_func && !const_item() && functype() != SUSERVAR_FUNC) + if (!with_sum_func && !const_item()) return new Item_field(result_field); return copy_or_same(thd); } |