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

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

Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
e6791ba5 · joreland@mysql.com · 29001997 · 187dce64 · e6791ba5
Commit e6791ba5 authored Jan 20, 2005 by joreland@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +4 -1

No files found.
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -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;