bk commit into 5.0 tree (gni:1.2259) BUG#21033

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-29 16:45:18+08:00, gni@dev3-127.(none) +1 -0
  BUG#21033  The error log of mysqld shows useless information, and hides the real error.

  ndb/src/ndbapi/Ndb.cpp@stripped, 2006-11-29 16:45:17+08:00, gni@dev3-127.(none) +7 -0
    Ndb.closeTransaction() modifies the value of Ndb.theError.code,
        but the error code shouldn't be changed here.
        Mysqld will use the returning error code to log the correct error information.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gni
# Host:	dev3-127.(none)
# Root:	/mnt/mysql/home/ngb/mysql-5.0/bug21033

--- 1.60/ndb/src/ndbapi/Ndb.cpp	2006-11-29 16:46:31 +08:00
+++ 1.61/ndb/src/ndbapi/Ndb.cpp	2006-11-29 16:46:31 +08:00
@@ -980,6 +980,8 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info
   Uint64             tValue;
   NdbRecAttr*        tRecAttrResult;
 
+  NdbError savedError;
+
   CHECK_STATUS_MACRO_ZERO;
 
   BaseString currentDb(getDatabaseName());
@@ -1074,7 +1076,12 @@ Ndb::opTupleIdOnNdb(Ndb_local_table_info
 
   error_handler:
     theError.code = tConnection->theError.code;
+
+    savedError = theError;
+
     this->closeTransaction(tConnection);
+    theError = savedError;
+
   error_return:
     // Restore current name space
     setDatabaseName(currentDb.c_str());