Commit d431d2c5 authored by unknown's avatar unknown
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21033


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
parents 8e0f8a62 fa5b6774

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