Commit 0e57035b authored by unknown's avatar unknown
Browse files

Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb-bj 

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
parents 3f064efb 7cde70c7

ndb/src/mgmclient/CommandInterpreter.cpp

+12 −0
Original line number Diff line number Diff line
@@ -2120,6 +2120,18 @@ CommandInterpreter::executeStatus(int processId, 
    ndbout << processId << ": Node not found" << endl;

    return -1;

  }

  if (cl->node_states[i].node_type != NDB_MGM_NODE_TYPE_NDB){

    if (cl->node_states[i].version != 0){

      ndbout << "Node "<< cl->node_states[i].node_id <<": connected" ;

      ndbout_c(" (Version %d.%d.%d)",

             getMajor(version) ,

             getMinor(version),

             getBuild(version));



    }else

     ndbout << "Node "<< cl->node_states[i].node_id <<": not connected" << endl;

    return 0;

  } 

  status = cl->node_states[i].node_status;

  startPhase = cl->node_states[i].start_phase;

  version = cl->node_states[i].version;

ndb/src/ndbapi/Ndb.cpp

+7 −0
Original line number Diff line number Diff line
@@ -983,6 +983,8 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 & opValue, Uint32 op) 
  Uint64             tValue;

  NdbRecAttr*        tRecAttrResult;



  NdbError savedError;



  CHECK_STATUS_MACRO_ZERO;



  BaseString currentDb(getDatabaseName());
@@ -1077,7 +1079,12 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info* info, Uint64 & opValue, Uint32 op) 


  error_handler:

    theError.code = tConnection->theError.code;



    savedError = theError;



    this->closeTransaction(tConnection);

    theError = savedError;



  error_return:

    // Restore current name space

    setDatabaseName(currentDb.c_str());