bk commit into 5.0 tree (tomas:1.2415)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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, 2007-03-25 16:44:06+02:00, tomas@stripped +1 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
  MERGE: 1.2377.38.11

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-03-25 16:44:03+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.103.2.3

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb/RESYNC

--- 1.109/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-23 14:07:48 +01:00
+++ 1.110/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-25 16:44:03 +02:00
@@ -6246,6 +6246,7 @@
     Uint32 api_timer= getApiConTimer(api_con_ptr);
     jam();
     if (api_timer != 0) {
+      Uint32 error= ZTIME_OUT_ERROR;
       time_out_value= time_out_param + (api_con_ptr & mask_value);
       if (unlikely(old_mask_value)) // abort during single user mode
       {
@@ -6259,12 +6260,16 @@
           time_out_value=
             old_time_out_param + (api_con_ptr & old_mask_value);
         }
+        else
+        {
+          error= ZCLUSTER_IN_SINGLEUSER_MODE;
+        }
       }
       time_passed= tc_timer - api_timer;
       if (time_passed > time_out_value) 
       {
         jam();
-        timeOutFoundLab(signal, api_con_ptr, ZTIME_OUT_ERROR);
+        timeOutFoundLab(signal, api_con_ptr, error);
 	api_con_ptr++;
 	break;
       }
@@ -6304,7 +6309,8 @@
 	<< " code: " << errCode);
   switch (apiConnectptr.p->apiConnectstate) {
   case CS_STARTED:
-    if(apiConnectptr.p->lqhkeyreqrec == apiConnectptr.p->lqhkeyconfrec){
+    if(apiConnectptr.p->lqhkeyreqrec == apiConnectptr.p->lqhkeyconfrec &&
+       errCode != ZCLUSTER_IN_SINGLEUSER_MODE){
       jam();
       /*
       We are waiting for application to continue the transaction. In this