diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-18 22:38:11 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-18 22:38:11 +0400 |
commit | 90fbd8b22b4b84cdc027fed26012efd87c2b6737 (patch) | |
tree | 48eff1dbe5fd3468e7583d1748de6b5cc8b16c92 /sql/item_func.cc | |
parent | db6dbadb5a9edd9e93398b6afe8e3196eb768e0a (diff) | |
parent | 64aa1fcb1354ffa24999a1512258c897116b0928 (diff) | |
download | mariadb-git-90fbd8b22b4b84cdc027fed26012efd87c2b6737.tar.gz |
Merge 5.2->5.3
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index e5225de62f9..00f8496b63b 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3027,6 +3027,7 @@ udf_handler::fix_fields(THD *thd, Item_result_field *func, func->maybe_null=1; func->with_sum_func= func->with_sum_func || item->with_sum_func; func->with_field= func->with_field || item->with_field; + func->with_subselect|= item->with_subselect; used_tables_cache|=item->used_tables(); const_item_cache&=item->const_item(); f_args.arg_type[i]=item->result_type(); |