Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj

into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug21033

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug21033
859493b3 · unknown · a05a771e · fc6a215a · 859493b3
Commit 859493b3 authored Sep 05, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

storage/ndb/src/ndbapi/Ndb.cpp storage/ndb/src/ndbapi/Ndb.cpp +5 -0

No files found.
--- a/storage/ndb/src/ndbapi/Ndb.cpp
+++ b/storage/ndb/src/ndbapi/Ndb.cpp
@@ -1147,9 +1147,14 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* table,
    theError.code = tOperation->theError.code;
  DBUG_ASSERT(theError.code != 0);

+  NdbError savedError;
+  savedError = theError;
+
  if (tConnection != NULL)
    this->closeTransaction(tConnection);

+  theError = savedError;
+
  DBUG_RETURN(-1);
 }