diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
| commit | 637c7529dec0fcc820fab0753679f94f31260a1e (patch) | |
| tree | 20b533d22ea39c933ac382d5309f7502783298e9 /sql/item_subselect.cc | |
| parent | d88a11a76687b8c7ae4cb0642a0977b7ca420ad0 (diff) | |
| parent | f563a012cebf217f32710b6d07f6b1ea58431146 (diff) | |
| download | mariadb-git-637c7529dec0fcc820fab0753679f94f31260a1e.tar.gz | |
Manual merge of the fix for bug #54190 and the addendum patch
to 5.5 (removed one test case as it is no longer valid).
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 8622e8f961d..56bd8c75a20 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -574,7 +574,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() |