From: Ole John Aske
Date: September 13 2012 9:20am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:3988 to 3989)
List-Archive: http://lists.mysql.com/commits/144758
Message-Id: <20120913092005.29804.30093.3989@fimafeng09.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3989 Ole John Aske	2012-09-13 [merge]
      Merge 7.1 -> 7.2

    added:
      mysql-test/suite/ndb/t/ndb_mt_recv-master.opt
      mysql-test/suite/ndb/t/ndb_mt_recv.cnf
      mysql-test/suite/ndb/t/ndb_mt_recv.test
    modified:
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
 3988 Jan Wedvik	2012-09-13 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== added file 'mysql-test/suite/ndb/t/ndb_mt_recv-master.opt'
--- a/mysql-test/suite/ndb/t/ndb_mt_recv-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_mt_recv-master.opt	2012-09-13 09:04:41 +0000
@@ -0,0 +1 @@
+--result-file=../suite/ndb/r/ndb_basic

=== added file 'mysql-test/suite/ndb/t/ndb_mt_recv.cnf'
--- a/mysql-test/suite/ndb/t/ndb_mt_recv.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_mt_recv.cnf	2012-09-13 09:18:40 +0000
@@ -0,0 +1,6 @@
+!include suite/ndb/my.cnf
+
+[cluster_config]
+# Config with multiple receiver threads on versions
+# which supports it (>= Cluster 7.2.x)
+ThreadConfig=recv={count=2}, main={count=1},tc={count=1},ldm={count=2},io={count=1},send={count=0},rep={count=1},

=== added file 'mysql-test/suite/ndb/t/ndb_mt_recv.test'
--- a/mysql-test/suite/ndb/t/ndb_mt_recv.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_mt_recv.test	2012-09-13 09:04:41 +0000
@@ -0,0 +1,9 @@
+#
+# Intention of this test is to do some basic testing with
+# multiple receiver threads.
+# It use 'ndb_basic' as testload, and override the default
+# config by specifying its own *.cnf file.
+# There is also a ndb_mt_recv-master.opt defined for
+# this test which specify 'result-file=...ndb_basic'.
+#
+--source ndb_basic.test

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-03-14 10:31:02 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2012-09-13 09:18:40 +0000
@@ -1274,6 +1274,7 @@ TransporterRegistry::poll_TCP(Uint32 tim
     const NDB_SOCKET_TYPE socket = t->getSocket();
     Uint32 node_id = t->getRemoteNodeId();
 
+    idx[i] = MAX_NODES + 1;
     if (!recvdata.m_transporters.get(node_id))
       continue;
 
@@ -1281,10 +1282,6 @@ TransporterRegistry::poll_TCP(Uint32 tim
     {
       idx[i] = recvdata.m_socket_poller.add(socket, true, false, false);
     }
-    else
-    {
-      idx[i] = MAX_NODES + 1;
-    }
   }
 
   int tcpReadSelectReply = recvdata.m_socket_poller.poll_unsafe(timeOutMillis);

No bundle (reason: useless for push emails).