diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-03-22 15:46:51 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-03-22 15:46:51 +0100 |
| commit | dec75d4ce242b3fc2a27eaaa33d4d3f2c5b56f95 (patch) | |
| tree | 96e0e283bb842157968c097cb2198b39ea85bb9d /ndb/tools/desc.cpp | |
| parent | be47bcecb6353a957b95535ca951a50a673881c2 (diff) | |
| download | mariadb-git-dec75d4ce242b3fc2a27eaaa33d4d3f2c5b56f95.tar.gz | |
ndb -
post merge fixes
ndb/include/mgmapi/ndbd_exit_codes.h:
post merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
post merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
post merge
ndb/src/kernel/error/ndbd_exit_codes.c:
post merge
ndb/tools/desc.cpp:
post merge
Diffstat (limited to 'ndb/tools/desc.cpp')
| -rw-r--r-- | ndb/tools/desc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp index 408227452a7..74cd740f2ae 100644 --- a/ndb/tools/desc.cpp +++ b/ndb/tools/desc.cpp @@ -119,7 +119,7 @@ int main(int argc, char** argv){ ndbout << endl; if (_partinfo) - print_part_info(pMyNdb, pTab); + print_part_info(&MyNdb, pTab); } else ndbout << argv[i] << ": " << dict->getNdbError() << endl; @@ -159,8 +159,8 @@ void print_part_info(Ndb* pNdb, NDBT_Table* pTab) if (pOp == NULL) break; - NdbResultSet* rs= pOp->readTuples(NdbOperation::LM_CommittedRead); - if (rs == 0) + int rs = pOp->readTuples(NdbOperation::LM_CommittedRead); + if (rs != 0) break; if (pOp->interpret_exit_last_row() != 0) @@ -183,7 +183,7 @@ void print_part_info(Ndb* pNdb, NDBT_Table* pTab) ndbout << g_part_info[i].m_title << "\t"; ndbout << endl; - while(rs->nextResult() == 0) + while(pOp->nextResult() == 0) { for(i = 0; g_part_info[i].m_title != 0; i++) { |