From: Jonas Oreland
Date: March 21 2012 2:10pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4492 to 4493)
List-Archive: http://lists.mysql.com/commits/143274
Message-Id: <20120321141010.87C9F55C8EA@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4493 Jonas Oreland	2012-03-21 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/vm/mt-send-t.cpp
 4492 Jonas Oreland	2012-03-21 [merge]
      ndb - merge 70 to 71

    added:
      storage/ndb/src/kernel/vm/mt-lock.hpp
      storage/ndb/src/kernel/vm/mt-send-t.cpp
    modified:
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'storage/ndb/src/kernel/vm/mt-send-t.cpp'
--- a/storage/ndb/src/kernel/vm/mt-send-t.cpp	2012-03-21 10:04:27 +0000
+++ b/storage/ndb/src/kernel/vm/mt-send-t.cpp	2012-03-21 14:07:51 +0000
@@ -6,6 +6,7 @@
 #include <NdbCondition.h>
 #include <NdbTap.hpp>
 #include <Bitmask.hpp>
+#include <ndb_rand.h>
 
 #define BUGGY_VERSION 0
 
@@ -249,7 +250,7 @@ thread_main(void * _t)
         /**
          * Produce a signal to destination D
          */
-        unsigned D = rand_r(&seed) % cnt_transporters;
+        unsigned D = unsigned(ndb_rand_r(&seed)) % cnt_transporters;
         self->p.produce(D);
       }
 
@@ -258,7 +259,7 @@ thread_main(void * _t)
       /**
        * This is the equivalent of do_send()
        */
-      bool force = unsigned(rand_r(&seed) % 100) < pct_force;
+      bool force = unsigned(ndb_rand_r(&seed) % 100) < pct_force;
       self->p.consume(force);
     }
     test.wait_completed();

No bundle (reason: useless for push emails).