Adjustments after the merge for bug 23478.

d8a83694 · igor@rurik.mysql.com · c6663c32 · d8a83694
Commit d8a83694 authored Oct 20, 2006 by igor@rurik.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/item_subselect.cc sql/item_subselect.cc +2 -0

No files found.
--- 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())
  {