bzr push into mysql-trunk branch (alexander.barkov:3557 to 3558) WL#946

[Alexander Barkov]

 3558 Alexander Barkov	2011-11-14
      WL#946 testing valgrind failures in "mtr --valgrind --do-test=subquery"

    modified:
      sql/item_sum.cc
 3557 Alexander Barkov	2011-11-14
      WL#946: BUG#13385275 - ASSERT FAILURE IN TIME_FROM_LONGLONG_PACKED 

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
      sql/item_func.cc
=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc	2011-11-10 14:58:23 +0000
+++ b/sql/item_sum.cc	2011-11-14 12:54:10 +0000
@@ -1957,7 +1957,7 @@ bool Item_sum_hybrid::get_date(MYSQL_TIM
 {
   DBUG_ASSERT(fixed == 1);
   if (null_value)
-    return 0;
+    return true;
   return (null_value= value->get_date(ltime, fuzzydate));
 }
 
@@ -1966,7 +1966,7 @@ bool Item_sum_hybrid::get_time(MYSQL_TIM
 {
   DBUG_ASSERT(fixed == 1);
   if (null_value)
-    return 0;
+    return true;
   return (null_value= value->get_time(ltime));
 }
 

No bundle (reason: useless for push emails).