summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index b93ea6f241b..b00c4c8090b 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -566,7 +566,10 @@ bool Item_singlerow_subselect::null_inside()
void Item_singlerow_subselect::bring_value()
{
- exec();
+ if (!exec() && assigned())
+ null_value= 0;
+ else
+ reset();
}
double Item_singlerow_subselect::val_real()