maria-developers team mailing list archive

[<sanja@xxxxxxxxxxxx>]

At file:///home/bell/maria/bzr/work-maria-5.3-scache2/

------------------------------------------------------------
revno: 2791
revision-id: sanja@xxxxxxxxxxxx-20100608074734-1m60ib2tac7y9m33
parent: sanja@xxxxxxxxxxxx-20100607075845-lo3tcaiuk54qqlw0
committer: sanja@xxxxxxxxxxxx
branch nick: work-maria-5.3-scache2
timestamp: Tue 2010-06-08 10:47:34 +0300
message:
  bugfixes lost in moving between trees

=== modified file 'sql/item.cc'
--- a/sql/item.cc	2010-05-31 21:25:54 +0000
+++ b/sql/item.cc	2010-06-08 07:47:34 +0000
@@ -5152,6 +5152,10 @@
 
 int Item_field::save_in_field(Field *to, bool no_conversions)
 {
+  /* if it is external field */
+  if (unlikely(depended_from))
+    return save_field_in_field(field, &null_value, to, no_conversions);
+
   return  save_field_in_field(result_field, &null_value, to, no_conversions);
 }
 
@@ -6359,7 +6363,7 @@
 int Item_ref::save_in_field(Field *to, bool no_conversions)
 {
   int res;
-  if (result_field)
+  if (result_field && !depended_from)
     return save_field_in_field(result_field, &null_value, to, no_conversions);
   res= (*ref)->save_in_field(to, no_conversions);
   null_value= (*ref)->null_value;