Commit f4d40b1b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
parents 2ac6a8f7 d07dc11f

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,10 @@ void Dbtc::execTCRELEASEREQ(Signal* signal) 
    if (tapiBlockref == apiConnectptr.p->ndbapiBlockref) {

      if (apiConnectptr.p->apiConnectstate == CS_CONNECTED ||

	  (apiConnectptr.p->apiConnectstate == CS_ABORTING &&

	   apiConnectptr.p->abortState == AS_IDLE)){

	   apiConnectptr.p->abortState == AS_IDLE) ||

	  (apiConnectptr.p->apiConnectstate == CS_STARTED &&

	   apiConnectptr.p->firstTcConnect == RNIL))

      {

        jam();                                   /* JUST REPLY OK */

        releaseApiCon(signal, apiConnectptr.i);

        signal->theData[0] = tuserpointer;