From: Ole John Aske
Date: October 4 2012 7:23am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:4016 to 4017)
List-Archive: http://lists.mysql.com/commits/144959
Message-Id: <20121004072314.1794.55218.4017@fimafeng09.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4017 Ole John Aske	2012-10-04 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/test/ndbapi/testSpj.cpp
 4016 Frazer Clement	2012-09-29 [merge]
      Merge 7.1->7.2

    modified:
      scripts/mysql_system_tables.sql
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/kernel/blocks/trpman.cpp
      storage/ndb/src/kernel/vm/NdbinfoTables.cpp
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'storage/ndb/test/ndbapi/testSpj.cpp'
--- a/storage/ndb/test/ndbapi/testSpj.cpp	2012-09-19 07:09:57 +0000
+++ b/storage/ndb/test/ndbapi/testSpj.cpp	2012-10-04 07:20:59 +0000
@@ -83,7 +83,7 @@ runLookupJoin(NDBT_Context* ctx, NDBT_St
   int i = 0;
   HugoQueryBuilder qb(GETNDB(step), ctx->getTab(), HugoQueryBuilder::O_LOOKUP);
   qb.setJoinLevel(joinlevel);
-  const NdbQueryDef * query = qb.createQuery(GETNDB(step));
+  const NdbQueryDef * query = qb.createQuery();
   HugoQueries hugoTrans(*query);
   while ((i<loops || until_stopped) && !ctx->isTestStopped())
   {
@@ -112,7 +112,7 @@ runLookupJoinError(NDBT_Context* ctx, ND
   int i = 0;
   HugoQueryBuilder qb(GETNDB(step), ctx->getTab(), HugoQueryBuilder::O_LOOKUP);
   qb.setJoinLevel(joinlevel);
-  const NdbQueryDef * query = qb.createQuery(GETNDB(step));
+  const NdbQueryDef * query = qb.createQuery();
   HugoQueries hugoTrans(*query);
 
   NdbRestarter restarter;
@@ -180,7 +180,7 @@ runScanJoin(NDBT_Context* ctx, NDBT_Step
   int i = 0;
   HugoQueryBuilder qb(GETNDB(step), ctx->getTab(), HugoQueryBuilder::O_SCAN);
   qb.setJoinLevel(joinlevel);
-  const NdbQueryDef * query = qb.createQuery(GETNDB(step));
+  const NdbQueryDef * query = qb.createQuery();
   HugoQueries hugoTrans(* query);
   while ((i<loops || until_stopped) && !ctx->isTestStopped())
   {
@@ -207,7 +207,7 @@ runScanJoinError(NDBT_Context* ctx, NDBT
   int i = 0;
   HugoQueryBuilder qb(GETNDB(step), ctx->getTab(), HugoQueryBuilder::O_SCAN);
   qb.setJoinLevel(joinlevel);
-  const NdbQueryDef * query = qb.createQuery(GETNDB(step));
+  const NdbQueryDef * query = qb.createQuery();
   HugoQueries hugoTrans(* query);
 
   NdbRestarter restarter;
@@ -280,8 +280,8 @@ runJoin(NDBT_Context* ctx, NDBT_Step* st
   HugoQueryBuilder qb2(GETNDB(step), ctx->getTab(), HugoQueryBuilder::O_LOOKUP);
   qb1.setJoinLevel(joinlevel);
   qb2.setJoinLevel(joinlevel);
-  const NdbQueryDef * q1 = qb1.createQuery(GETNDB(step));
-  const NdbQueryDef * q2 = qb2.createQuery(GETNDB(step));
+  const NdbQueryDef * q1 = qb1.createQuery();
+  const NdbQueryDef * q2 = qb2.createQuery();
   HugoQueries hugoTrans1(* q1);
   HugoQueries hugoTrans2(* q2);
   while ((i<loops || until_stopped) && !ctx->isTestStopped())

No bundle (reason: useless for push emails).