mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 03:35:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse source 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
This commit is contained in:
unknown 2007-02-02 09:31:36 +00:00
commit 61aee35cc7
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ndb/src/mgmclient/CommandInterpreter.cpp
View file

@ -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;

7
ndb/src/ndbapi/Ndb.cpp
View file

@ -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());