bk commit into 4.1 tree (mskold:1.1919)

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1919 04/07/20 16:31:18 mskold@stripped +1 -0
  Fix for bug#4650 Scan does not report timeout of owning transaction

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.17 04/07/20 16:30:56 mskold@stripped +7 -0
    Fix for bug#4650 Scan does not report timeout of owning transaction

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1-ndb

--- 1.16/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	Thu Jul  8 08:12:26 2004
+++ 1.17/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	Tue Jul 20 16:30:56 2004
@@ -8502,6 +8502,13 @@
     if ((transid1 == buddyApiPtr.p->transid[0]) &&
 	(transid2 == buddyApiPtr.p->transid[1])) {
       jam();
+      
+      if (buddyApiPtr.p->apiConnectstate == CS_ABORTING) {
+	// transaction has timed out
+	jam();
+	errCode = ZTIME_OUT_ERROR;
+	goto SCAN_TAB_error;
+      }//if
       currSavePointId = buddyApiPtr.p->currSavePointId;
       buddyApiPtr.p->currSavePointId++;
     }