bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas.oreland:3558 to 3559)

[jonas oreland]

 3559 jonas oreland	2011-09-16 [merge]
      ndb - merge 70 to 70-spj

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 3558 Jan Wedvik	2011-09-16 [merge]
      Merged from mysql-5.1-telco-7.0.

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-09-16 11:55:28 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-09-16 14:37:13 +0000
@@ -5054,8 +5054,9 @@ Dbspj::scanIndex_parent_batch_complete(S
      * in the other direction is more costly).
      */
     Int32 parallelism = 
-      static_cast<Int32>(MIN(round(data.m_parallelismStat.getMean()
-                                   - 2 * data.m_parallelismStat.getStdDev()),
+      static_cast<Int32>(MIN(data.m_parallelismStat.getMean()
+                             // Add 0.5 to get proper rounding.
+                             - 2 * data.m_parallelismStat.getStdDev() + 0.5,
                              org->batch_size_rows));
 
     if (parallelism < 1)

No bundle (reason: useless for push emails).