diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 16:48:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 16:48:06 +0400 |
| commit | df198b5f6af95b56cb6440b18097f03c3b2dde65 (patch) | |
| tree | 7de606941c1bb9a49cc8ff9491c72147b48f72c9 /sql/item_subselect.cc | |
| parent | babebf9cebd2218fcc29e7d0cdbecb501f6fec30 (diff) | |
| parent | 9066714c817fc0816333cde52bead2652125d118 (diff) | |
| download | mariadb-git-df198b5f6af95b56cb6440b18097f03c3b2dde65.tar.gz | |
Automerge.
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 d0c933df845..adce24e7799 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() |