summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2006-10-20 12:41:27 -0700
committerigor@rurik.mysql.com <>2006-10-20 12:41:27 -0700
commitd8a836945487660ee931ceff26e27233bde4e4cf (patch)
tree8ecf116e80e2885e5d7d3dca686d43483d13439d /sql/item_subselect.cc
parentc6663c32db4b2061fc825d51febb5ea6c62dbaa4 (diff)
downloadmariadb-git-d8a836945487660ee931ceff26e27233bde4e4cf.tar.gz
Adjustments after the merge for bug 23478.
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 78dae0aaa1e..7015f450aa7 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -729,6 +729,7 @@ String *Item_in_subselect::val_str(String *str)
bool Item_in_subselect::val_bool()
{
DBUG_ASSERT(fixed == 1);
+ null_value= 0;
if (exec())
{
reset();
@@ -747,6 +748,7 @@ my_decimal *Item_in_subselect::val_decimal(my_decimal *decimal_value)
method should not be used
*/
DBUG_ASSERT(0);
+ null_value= 0;
DBUG_ASSERT(fixed == 1);
if (exec())
{