Commit 3e4b1c56 authored by unknown's avatar unknown
Browse files

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

parents 34b3818b 59da4b42
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -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);
}