summaryrefslogtreecommitdiff
path: root/sql/item_row.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-06-20 15:01:28 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-06-20 15:01:28 +0400
commit8c762965d389dcd9e74c743aaf2a89bd8c18545f (patch)
treea266816b7b2a7e5f2266fa46b7b8627aa5543773 /sql/item_row.cc
parent0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (diff)
parent584d923c3292395a2e8288adcf4795992789f27c (diff)
downloadmariadb-git-8c762965d389dcd9e74c743aaf2a89bd8c18545f.tar.gz
Merge 5.3 -> 5.5
Diffstat (limited to 'sql/item_row.cc')
-rw-r--r--sql/item_row.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_row.cc b/sql/item_row.cc
index 530a40c55dc..2c4a628075e 100644
--- a/sql/item_row.cc
+++ b/sql/item_row.cc
@@ -95,6 +95,7 @@ bool Item_row::fix_fields(THD *thd, Item **ref)
maybe_null|= item->maybe_null;
with_sum_func= with_sum_func || item->with_sum_func;
with_field= with_field || item->with_field;
+ with_subselect|= item->with_subselect;
}
fixed= 1;
return FALSE;