4621 Ole John Aske 2012-10-04 [merge]
Merge 7.0 -> 7.1
modified:
storage/ndb/test/ndbapi/testSpj.cpp
4620 Frazer Clement 2012-09-29 [merge]
Merge 7.0->7.1
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-13 08:05:29 +0000
+++ b/storage/ndb/test/ndbapi/testSpj.cpp 2012-10-04 07:13:01 +0000
@@ -75,7 +75,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())
{
@@ -102,7 +102,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())
{
@@ -132,8 +132,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).
Thread |
---|
• bzr push into mysql-5.1-telco-7.1 branch (ole.john.aske:4620 to 4621) | Ole John Aske | 4 Oct |