[No BUG#] Fixes for problems discovered when running mysql-trunk's subquery testsuite

1 files changed, 13 insertions, 1 deletions

diff --git a/sql/item.cc b/sql/item.cc
index d3a43818d23..ca49cf20cd9 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -6768,7 +6768,19 @@ my_decimal *Item_ref::val_decimal(my_decimal *decimal_value)
 int Item_ref::save_in_field(Field *to, bool no_conversions)
 {
   int res;
-  DBUG_ASSERT(!result_field);
+  if (result_field)
+  {
+    if (result_field->is_null())
+    {
+      null_value= 1;
+      res= set_field_to_null_with_conversions(to, no_conversions);
+      return res;
+    }
+    to->set_notnull();
+    res= field_conv(to, result_field);
+    null_value= 0;
+    return res;
+  }
   res= (*ref)->save_in_field(to, no_conversions);
   null_value= (*ref)->null_value;
   return res;