List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:March 13 2010 9:56am
Subject:bzr push into mysql-5.1-telco-6.2 branch (jonas:3086 to 3087)
View as plain text  
 3087 Jonas Oreland	2010-03-12
      ndb - fake-fix of bug-51289 causing compile warning

    modified:
      sql/item.cc
 3086 Jonas Oreland	2010-03-12
      ndb - post merge 5.1.44 fixes

    modified:
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      sql/sql_yacc.yy
=== modified file 'sql/item.cc'
--- a/sql/item.cc	2010-03-12 06:06:23 +0000
+++ b/sql/item.cc	2010-03-12 14:32:53 +0000
@@ -7113,7 +7113,7 @@ double Item_cache_decimal::val_real()
   DBUG_ASSERT(fixed);
   double res;
   if (!value_cached && !cache_value())
-    return NULL;
+    return (double)0;
   my_decimal2double(E_DEC_FATAL_ERROR, &decimal_value, &res);
   return res;
 }


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100312143253-1p2k861sk1cgom9h.bundle
Thread
• bzr push into mysql-5.1-telco-6.2 branch (jonas:3086 to 3087)Jonas Oreland13 Mar 2010