diff options
| author | unknown <igor@rurik.mysql.com> | 2006-10-20 12:43:01 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-10-20 12:43:01 -0700 |
| commit | 3cf49a3dd890bd6229acd8c89b672359e7d16452 (patch) | |
| tree | 6caef9405b467cd060ff63e792bd3b5ad8ba34e0 /sql | |
| parent | ab133655360a284567b74be79765031493823479 (diff) | |
| parent | c3f2224f2e735e480058e1a5975f08e19d3c52a0 (diff) | |
| download | mariadb-git-3cf49a3dd890bd6229acd8c89b672359e7d16452.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_subselect.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 0ad517609c9..7015f450aa7 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -667,6 +667,7 @@ double Item_in_subselect::val_real() */ DBUG_ASSERT(0); DBUG_ASSERT(fixed == 1); + null_value= 0; if (exec()) { reset(); @@ -687,6 +688,7 @@ longlong Item_in_subselect::val_int() */ DBUG_ASSERT(0); DBUG_ASSERT(fixed == 1); + null_value= 0; if (exec()) { reset(); @@ -707,6 +709,7 @@ String *Item_in_subselect::val_str(String *str) */ DBUG_ASSERT(0); DBUG_ASSERT(fixed == 1); + null_value= 0; if (exec()) { reset(); @@ -726,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(); @@ -744,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()) { |