bk commit into 5.0 tree (jonas:1.2278) BUG#25090

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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-12-15 12:37:55+01:00, jonas@stripped +1 -0
  ndb - bug#25090
    make sure apicon timer is reset when setting CS_CONNECTED

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2006-12-15 12:37:53+01:00,
jonas@stripped +2 -0
    make sure apicon timer is reset when setting CS_CONNECTED

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.100/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-12-15 12:37:58 +01:00
+++ 1.101/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-12-15 12:37:58 +01:00
@@ -5220,6 +5220,8 @@
 	    jam();
 	    sendtckeyconf(signal, 1);
 	    regApiPtr->apiConnectstate = CS_CONNECTED;
+	    regApiPtr->m_transaction_nodes.clear();
+	    setApiConTimer(apiConnectptr.i, 0,__LINE__);
 	  }
 	  return;
 	} else if (regApiPtr->tckeyrec > 0 || regApiPtr->m_exec_flag) {