bzr push into mysql-5.1-telco-7.0-wl4124 branch (pekka:4380 to 4381) WL#4124

[Pekka Nousiainen]

 4381 Pekka Nousiainen	2011-05-24
      wl#4124 x03_fix.diff
      windows build fixes

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
 4380 Pekka Nousiainen	2011-05-24
      wl#4124 x02_fix.diff
      windows build fixes

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2011-05-24 14:26:59 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2011-05-24 17:54:07 +0000
@@ -203,7 +203,7 @@ Dbtux::getPathToNode(NodeHandle node, Ui
 static double
 tux_log2(double x)
 {
-  return ::log(x) / ::log(2);
+  return ::log(x) / ::log((double)2.0);
 }
 
 int

No bundle (reason: useless for push emails).