diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 4bf849c23c2fe2174016da630705a362f76d3922 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/item_func.cc | |
| parent | f04cf03f75ffca0b99562c027c1c57340d375f66 (diff) | |
| parent | 62db6839b82d824567979ef3e05caccd67ed11ec (diff) | |
| download | mariadb-git-4bf849c23c2fe2174016da630705a362f76d3922.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.
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 b99e2281641..6c295635d6c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -605,7 +605,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); } |