diff options
| author | unknown <igor@rurik.mysql.com> | 2006-10-20 09:26:01 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-10-20 09:26:01 -0700 |
| commit | 5676602fb1afde077762fd17b11ca4d90ffbbc1f (patch) | |
| tree | b5e852d3690e97723c00f142ef6c8b6054451c77 /sql/item_subselect.cc | |
| parent | 5e1fe0f80043993c1db64169e4d87eb787762763 (diff) | |
| parent | d649efbb07af288b6b58b4bd01a04d34c7a7f467 (diff) | |
| download | mariadb-git-5676602fb1afde077762fd17b11ca4d90ffbbc1f.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
sql/item_subselect.cc:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 0ad517609c9..78dae0aaa1e 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(); |