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

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