bk commit into 5.0 tree (jimw:1.1961)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1961 05/05/09 09:46:13 jimw@stripped +21 -0
  Merge

  sql/table.cc
    1.161 05/05/09 09:45:59 jimw@stripped +4 -5
    Merge from 4.1

  sql/mysql_priv.h
    1.295 05/05/09 09:44:21 jimw@stripped +3 -3
    merge from 4.1

  ndb/test/run-test/Makefile.am
    1.20 05/05/09 09:43:43 jimw@stripped +1 -2
    merge

  ndb/src/ndbapi/ClusterMgr.cpp
    1.18 05/05/09 09:42:49 jimw@stripped +0 -1
    merge

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.71 05/05/09 09:41:36 jimw@stripped +0 -1
    merge 4.1

  configure.in
    1.309 05/05/09 09:40:30 jimw@stripped +0 -1
    Ignore 4.1 version change

  sql/sql_yacc.yy
    1.371 05/05/09 09:40:16 jimw@stripped +0 -0
    Auto merged

  sql/sql_udf.h
    1.11 05/05/09 09:40:16 jimw@stripped +0 -0
    Auto merged

  sql/item_sum.h
    1.86 05/05/09 09:40:16 jimw@stripped +0 -0
    Auto merged

  sql/item_strfunc.cc
    1.224 05/05/09 09:40:16 jimw@stripped +0 -0
    Auto merged

  sql/item_func.h
    1.114 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  sql/item.h
    1.123 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  ndb/test/ndbapi/testNodeRestart.cpp
    1.13 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/ndberror.c
    1.37 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.22 05/05/09 09:40:15 jimw@stripped +0 -1
    Auto merged

  ndb/src/mgmapi/mgmapi.cpp
    1.46 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.27 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  mysql-test/t/select.test
    1.44 05/05/09 09:40:15 jimw@stripped +16 -16
    Auto merged

  mysql-test/r/select.result
    1.58 05/05/09 09:40:15 jimw@stripped +10 -10
    Auto merged

  mysql-test/r/ctype_utf8.result
    1.57 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

  include/my_global.h
    1.84 05/05/09 09:40:15 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.223/sql/item_strfunc.cc	2005-03-18 16:12:21 -08:00
+++ 1.224/sql/item_strfunc.cc	2005-05-09 09:40:16 -07:00
@@ -1013,7 +1013,7 @@
   if ((null_value=(args[0]->null_value || args[1]->null_value ||
 		   (arg_count == 3 && args[2]->null_value))))
     return 0; /* purecov: inspected */
-  start= (int32)((start < 0) ? res->length() + start : start -1);
+  start= (int32)((start < 0) ? res->numchars() + start : start -1);
   start=res->charpos(start);
   length=res->charpos(length,start);
   if (start < 0 || (uint) start+1 > res->length() || length <= 0)

--- 1.294/sql/mysql_priv.h	2005-05-06 03:46:03 -07:00
+++ 1.295/sql/mysql_priv.h	2005-05-09 09:44:21 -07:00
@@ -268,6 +268,9 @@
 #define OPTION_SCHEMA_TABLE             (1L << 29)
 /* Flag set if setup_tables already done */
 #define OPTION_SETUP_TABLES_DONE        (1L << 30)
+/* Thr following is used to detect a conflict with DISTINCT
+   in the user query has requested */
+#define SELECT_ALL			(ULL(1) << 32)
 
 /* 
   Maximum length of time zone name that we support 

--- 1.370/sql/sql_yacc.yy	2005-05-07 08:50:16 -07:00
+++ 1.371/sql/sql_yacc.yy	2005-05-09 09:40:16 -07:00
@@ -4000,7 +4000,15 @@
 	      YYABORT;
 	    Lex->lock_option= TL_READ_HIGH_PRIORITY;
 	  }
-	| DISTINCT	{ Select->options|= SELECT_DISTINCT; }
+	| DISTINCT
+	  {
+            if (Select->options & SELECT_ALL)
+            {
+              yyerror(ER(ER_SYNTAX_ERROR));
+              YYABORT;
+            }
+            Select->options|= SELECT_DISTINCT; 
+	  }
 	| SQL_SMALL_RESULT { Select->options|= SELECT_SMALL_RESULT; }
 	| SQL_BIG_RESULT { Select->options|= SELECT_BIG_RESULT; }
 	| SQL_BUFFER_RESULT
@@ -4020,7 +4028,15 @@
 	  {
 	    Lex->select_lex.options|= OPTION_TO_QUERY_CACHE;
 	  }
-	| ALL		{}
+	| ALL
+	  {
+            if (Select->options & SELECT_DISTINCT)
+            {
+              yyerror(ER(ER_SYNTAX_ERROR));
+              YYABORT;
+            }
+            Select->options|= SELECT_ALL; 
+	  }
 	;
 
 select_lock_type:

--- 1.160/sql/table.cc	2005-04-12 00:27:37 -07:00
+++ 1.161/sql/table.cc	2005-05-09 09:45:59 -07:00
@@ -59,6 +59,7 @@
    3    Wrong data in .frm file
    4    Error (see frm_error)
    5    Error (see frm_error: charset unavailable)
+   6    Unknown .frm version
 */
 
 int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
@@ -135,10 +136,14 @@
   *fn_ext(share->table_name)='\0';		// Remove extension
   *fn_ext(share->path)='\0';                    // Remove extension
 
-  if (head[0] != (uchar) 254 || head[1] != 1 ||
-      (head[2] != FRM_VER && head[2] != FRM_VER+1 &&
-       ! (head[2] >= FRM_VER+3 && head[2] <= FRM_VER+4)))
+  if (head[0] != (uchar) 254 || head[1] != 1)
     goto err;                                   /* purecov: inspected */
+  if (head[2] != FRM_VER && head[2] != FRM_VER+1 &&
+       ! (head[2] >= FRM_VER+3 && head[2] <= FRM_VER+4))
+  {
+    error= 6;
+    goto err;                                   /* purecov: inspected */
+  }
   new_field_pack_flag=head[27];
   new_frm_ver= (head[2] - FRM_VER);
   field_pack_length= new_frm_ver < 2 ? 11 : 17;
@@ -1084,6 +1089,12 @@
                     MYF(0), csname, real_name);
     break;
   }
+  case 6:
+    my_printf_error(ER_NOT_FORM_FILE,
+                    "Table '%-.64s' was created with a different version "
+                    "of MySQL and cannot be read",
+                    MYF(0), name);
+    break;
   default:				/* Better wrong error than none */
   case 4:
     my_error(ER_NOT_FORM_FILE, errortype,

--- 1.56/mysql-test/r/ctype_utf8.result	2005-03-27 23:33:54 -08:00
+++ 1.57/mysql-test/r/ctype_utf8.result	2005-05-09 09:40:15 -07:00
@@ -817,6 +817,9 @@
 select 'c' like '\_' as want0;
 want0
 0
+SELECT SUBSTR('вася',-2);
+SUBSTR('вася',-2)
+ся
 create table t1 (id integer, a varchar(100) character set utf8 collate utf8_unicode_ci);
 insert into t1 values (1, 'Test');
 select * from t1 where soundex(a) = soundex('Test');

--- 1.26/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2005-01-12 06:36:49 -08:00
+++ 1.27/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2005-05-09 09:40:15 -07:00
@@ -585,34 +585,8 @@
    */
   ArrayPool<TcIndexOperation> c_theIndexOperationPool;
 
-  /**
-   * The list of index operations
-   */  
-  ArrayList<TcIndexOperation> c_theIndexOperations;
-
   UintR c_maxNumberOfIndexOperations;   
 
-  struct TcSeizedIndexOperation {
-    /**
-     * Next ptr (used in pool/list)
-     */
-    union {
-      Uint32 nextPool;
-      Uint32 nextList;
-    };
-    /**
-     * Prev pointer (used in list)
-     */
-    Uint32 prevList;
-  };
-
-  /**
-   * Pool of seized index operations
-   */
-  ArrayPool<TcSeizedIndexOperation> c_theSeizedIndexOperationPool;
-
-  typedef Ptr<TcSeizedIndexOperation> TcSeizedIndexOperationPtr;
-
   /************************** API CONNECT RECORD ***********************
    * The API connect record contains the connection record to which the
    * application connects.  
@@ -650,7 +624,7 @@
 
   struct ApiConnectRecord {
     ApiConnectRecord(ArrayPool<TcFiredTriggerData> & firedTriggerPool,
-		     ArrayPool<TcSeizedIndexOperation> & seizedIndexOpPool):
+		     ArrayPool<TcIndexOperation> & seizedIndexOpPool):
       theFiredTriggers(firedTriggerPool),
       isIndexOp(false),
       theSeizedIndexOperations(seizedIndexOpPool) 
@@ -763,7 +737,7 @@
     UintR accumulatingIndexOp;
     UintR executingIndexOp;
     UintR tcIndxSendArray[6];
-    ArrayList<TcSeizedIndexOperation> theSeizedIndexOperations;
+    ArrayList<TcIndexOperation> theSeizedIndexOperations;
   };
   
   typedef Ptr<ApiConnectRecord> ApiConnectRecordPtr;

--- 1.70/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-04-21 01:24:38 -07:00
+++ 1.71/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-05-09 09:41:36 -07:00
@@ -11368,18 +11368,18 @@
     jam();
     // This is a newly started transaction, clean-up
     releaseAllSeizedIndexOperations(regApiPtr);
+
+    regApiPtr->transid[0] = tcIndxReq->transId1;
+    regApiPtr->transid[1] = tcIndxReq->transId2;
   }//if
-  if (!seizeIndexOperation(regApiPtr, indexOpPtr)) {
+
+  if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) {
     jam();
     // Failed to allocate index operation
-    TcKeyRef * const tcIndxRef = (TcKeyRef *)signal->getDataPtrSend();
-
-    tcIndxRef->connectPtr = tcIndxReq->senderData;
-    tcIndxRef->transId[0] = regApiPtr->transid[0];
-    tcIndxRef->transId[1] = regApiPtr->transid[1];
-    tcIndxRef->errorCode = 4000;
-    sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal, 
-	       TcKeyRef::SignalLength, JBB);
+    terrorCode = 288;
+    regApiPtr->m_exec_flag |= TcKeyReq::getExecuteFlag(tcIndxRequestInfo);
+    apiConnectptr = transPtr;
+    abortErrorLab(signal);
     return;
   }
   TcIndexOperation* indexOp = indexOpPtr.p;
@@ -11514,15 +11514,17 @@
   TcIndexOperationPtr indexOpPtr;
   TcIndexOperation* indexOp;
 
-  indexOpPtr.i = regApiPtr->accumulatingIndexOp;
-  indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
-  if (saveINDXKEYINFO(signal,
-                      indexOp, 
-                      src, 
-                      keyInfoLength)) {
-    jam();
-    // We have received all we need
-    readIndexTable(signal, regApiPtr, indexOp);
+  if((indexOpPtr.i = regApiPtr->accumulatingIndexOp) != RNIL)
+  {
+    indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
+    if (saveINDXKEYINFO(signal,
+			indexOp, 
+			src, 
+			keyInfoLength)) {
+      jam();
+      // We have received all we need
+      readIndexTable(signal, regApiPtr, indexOp);
+    }
   }
 }
 
@@ -11545,15 +11547,17 @@
   TcIndexOperationPtr indexOpPtr;
   TcIndexOperation* indexOp;
 
-  indexOpPtr.i = regApiPtr->accumulatingIndexOp;
-  indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
-  if (saveINDXATTRINFO(signal,
-                       indexOp, 
-                       src, 
-                       attrInfoLength)) {
-    jam();
-    // We have received all we need
-    readIndexTable(signal, regApiPtr, indexOp);
+  if((indexOpPtr.i = regApiPtr->accumulatingIndexOp) != RNIL)
+  {
+    indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
+    if (saveINDXATTRINFO(signal,
+			 indexOp, 
+			 src, 
+			 attrInfoLength)) {
+      jam();
+      // We have received all we need
+      readIndexTable(signal, regApiPtr, indexOp);
+    }
   }
 }
 
@@ -11578,7 +11582,7 @@
     releaseIndexOperation(apiConnectptr.p, indexOp);
     terrorCode = 4000;
     abortErrorLab(signal);
-    return true;
+    return false;
   }
   if (receivedAllINDXKEYINFO(indexOp) && receivedAllINDXATTRINFO(indexOp)) {
     jam();
@@ -11611,7 +11615,7 @@
     releaseIndexOperation(apiConnectptr.p, indexOp);
     terrorCode = 4000;
     abortErrorLab(signal);
-    return true;
+    return false;
   }
   if (receivedAllINDXKEYINFO(indexOp) && receivedAllINDXATTRINFO(indexOp)) {
     jam();
@@ -11671,7 +11675,7 @@
 
   jamEntry();
   indexOpPtr.i = tcKeyConf->apiConnectPtr;
-  TcIndexOperation* indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
+  TcIndexOperation* indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
   Uint32 confInfo = tcKeyConf->confInfo;
 
   /**
@@ -11760,7 +11764,7 @@
 
   jamEntry();
   indexOpPtr.i = tcKeyRef->connectPtr;
-  TcIndexOperation* indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
+  TcIndexOperation* indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
   indexOpPtr.p = indexOp;
   if (!indexOp) {
     jam();    
@@ -11861,7 +11865,7 @@
   jamEntry();
   TcIndexOperationPtr indexOpPtr;
   indexOpPtr.i = transIdAI->connectPtr;
-  TcIndexOperation* indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
+  TcIndexOperation* indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
   indexOpPtr.p = indexOp;
   if (!indexOp) {
     jam();
@@ -11969,7 +11973,7 @@
   jamEntry();
   TcIndexOperationPtr indexOpPtr;
   indexOpPtr.i = tcRollbackRep->connectPtr;
-  TcIndexOperation* indexOp = c_theIndexOperations.getPtr(indexOpPtr.i);
+  TcIndexOperation* indexOp = c_theIndexOperationPool.getPtr(indexOpPtr.i);
   indexOpPtr.p = indexOp;
   tcRollbackRep =  (TcRollbackRep *)signal->getDataPtrSend();
   tcRollbackRep->connectPtr = indexOp->tcIndxReq.senderData;
@@ -12297,16 +12301,7 @@
 bool Dbtc::seizeIndexOperation(ApiConnectRecord* regApiPtr,
 			       TcIndexOperationPtr& indexOpPtr)
 {
-  bool seizeOk;
-
-  seizeOk = c_theIndexOperations.seize(indexOpPtr);
-  if (seizeOk) {
-    jam();
-    TcSeizedIndexOperationPtr seizedIndexOpPtr;
-    seizeOk &= regApiPtr->theSeizedIndexOperations.seizeId(seizedIndexOpPtr,
-							   indexOpPtr.i);
-  }
-  return seizeOk;
+  return regApiPtr->theSeizedIndexOperations.seize(indexOpPtr);
 }
 
 void Dbtc::releaseIndexOperation(ApiConnectRecord* regApiPtr,
@@ -12320,18 +12315,16 @@
   indexOp->expectedTransIdAI = 0;
   indexOp->transIdAI.release();
   regApiPtr->theSeizedIndexOperations.release(indexOp->indexOpId);
-  c_theIndexOperations.release(indexOp->indexOpId);
 }
 
 void Dbtc::releaseAllSeizedIndexOperations(ApiConnectRecord* regApiPtr)
 {
-  TcSeizedIndexOperationPtr seizedIndexOpPtr;
+  TcIndexOperationPtr seizedIndexOpPtr;
 
   regApiPtr->theSeizedIndexOperations.first(seizedIndexOpPtr);
   while(seizedIndexOpPtr.i != RNIL) {
     jam();
-    TcIndexOperation* indexOp = 
-      c_theIndexOperations.getPtr(seizedIndexOpPtr.i);
+    TcIndexOperation* indexOp = seizedIndexOpPtr.p;
 
     indexOp->indexOpState = IOS_NOOP;
     indexOp->expectedKeyInfo = 0;
@@ -12340,7 +12333,6 @@
     indexOp->attrInfo.release();
     indexOp->expectedTransIdAI = 0;
     indexOp->transIdAI.release();
-    c_theIndexOperations.release(seizedIndexOpPtr.i);  
     regApiPtr->theSeizedIndexOperations.next(seizedIndexOpPtr);    
   }
   regApiPtr->theSeizedIndexOperations.release();

--- 1.45/ndb/src/mgmapi/mgmapi.cpp	2005-04-22 00:09:16 -07:00
+++ 1.46/ndb/src/mgmapi/mgmapi.cpp	2005-05-09 09:40:15 -07:00
@@ -892,7 +892,10 @@
     args.put("initialstart", initial);
     args.put("nostart", nostart);
     const Properties *reply;
+    const int timeout = handle->read_timeout;
+    handle->read_timeout= 5*60*1000; // 5 minutes
     reply = ndb_mgm_call(handle, restart_reply, "restart all", &args);
+    handle->read_timeout= timeout;
     CHECK_REPLY(reply, -1);
 
     BaseString result;
@@ -925,7 +928,10 @@
   args.put("nostart", nostart);
 
   const Properties *reply;
+  const int timeout = handle->read_timeout;
+  handle->read_timeout= 5*60*1000; // 5 minutes
   reply = ndb_mgm_call(handle, restart_reply, "restart node", &args);
+  handle->read_timeout= timeout;
   if(reply != NULL) {
     BaseString result;
     reply->get("result", result);

--- 1.17/ndb/src/ndbapi/ClusterMgr.cpp	2005-03-04 00:55:12 -08:00
+++ 1.18/ndb/src/ndbapi/ClusterMgr.cpp	2005-05-09 09:42:49 -07:00
@@ -66,6 +66,7 @@
 {
   ndbSetOwnVersion();
   clusterMgrThreadMutex = NdbMutex_Create();
+  noOfAliveNodes= 0;
   noOfConnectedNodes= 0;
   theClusterMgrThread= 0;
 }
@@ -336,9 +337,9 @@
   node.m_state = apiRegConf->nodeState;
   if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED  ||
 			  node.m_state.startLevel == NodeState::SL_SINGLEUSER)){
-    node.m_alive = true;
+    set_node_alive(node, true);
   } else {
-    node.m_alive = false;
+    set_node_alive(node, false);
   }//if
   node.hbSent = 0;
   node.hbCounter = 0;
@@ -361,7 +362,7 @@
   assert(node.defined == true);
 
   node.compatible = false;
-  node.m_alive = false;
+  set_node_alive(node, false);
   node.m_state = NodeState::SL_NOTHING;
   node.m_info.m_version = ref->version;
 
@@ -446,7 +447,7 @@
 
   Node & theNode = theNodes[nodeId];
  
-  theNode.m_alive = false;
+  set_node_alive(theNode, false);
   theNode.m_info.m_connectCount ++;
   
   if(theNode.connected)
@@ -462,8 +463,7 @@
   }
   
   theNode.nfCompleteRep = false;
-  
-  if(noOfConnectedNodes == 0){
+  if(noOfAliveNodes == 0){
     NFCompleteRep rep;
     for(Uint32 i = 1; i<MAX_NODES; i++){
       if(theNodes[i].defined && theNodes[i].nfCompleteRep == false){

--- 1.12/ndb/test/ndbapi/testNodeRestart.cpp	2005-03-09 02:50:30 -08:00
+++ 1.13/ndb/test/ndbapi/testNodeRestart.cpp	2005-05-09 09:40:15 -07:00
@@ -359,7 +359,7 @@
     if(hugoOps.startTransaction(pNdb) != 0)
       return NDBT_FAILED;
       
-    if(hugoOps.pkUpdateRecord(pNdb, 1) != 0)
+    if(hugoOps.pkUpdateRecord(pNdb, 1, 128) != 0)
       return NDBT_FAILED;
 
     if(hugoOps.execute_NoCommit(pNdb) != 0)

--- 1.57/mysql-test/r/select.result	2005-05-06 07:31:24 -07:00
+++ 1.58/mysql-test/r/select.result	2005-05-09 09:40:15 -07:00
@@ -2476,3 +2476,13 @@
 NULL
 1.0000
 drop table t1;
+create table t1 (a int(11));
+select all all * from t1;
+a
+select distinct distinct * from t1;
+a
+select all distinct * from t1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'distinct * from t1' at line 1
+select distinct all * from t1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'all * from t1' at line 1
+drop table t1;

--- 1.43/mysql-test/t/select.test	2005-05-06 07:31:24 -07:00
+++ 1.44/mysql-test/t/select.test	2005-05-09 09:40:15 -07:00
@@ -2056,3 +2056,19 @@
 insert into t1 values (null),(1);
 select distinct avg(s1) as x from t1 group by s1 with rollup;
 drop table t1;
+
+
+#
+# Bug#8733 server accepts malformed query (multiply mentioned distinct)
+#
+create table t1 (a int(11));
+select all all * from t1;
+select distinct distinct * from t1;
+--error 1064
+select all distinct * from t1;
+--error 1064
+select distinct all * from t1;
+drop table t1;
+
+
+#

--- 1.83/include/my_global.h	2005-05-09 02:31:25 -07:00
+++ 1.84/include/my_global.h	2005-05-09 09:40:15 -07:00
@@ -308,9 +308,15 @@
 #ifndef CONFIG_SMP
 #define CONFIG_SMP
 #endif
+#if defined(__ia64__)
+#define new my_arg_new
+#endif
 C_MODE_START
 #include <asm/atomic.h>
 C_MODE_END
+#if defined(__ia64__)
+#undef new
+#endif
 #endif
 #include <errno.h>				/* Recommended by debian */
 /* We need the following to go around a problem with openssl on solaris */

--- 1.36/ndb/src/ndbapi/ndberror.c	2005-04-27 09:28:55 -07:00
+++ 1.37/ndb/src/ndbapi/ndberror.c	2005-05-09 09:40:15 -07:00
@@ -173,7 +173,7 @@
   { 4021, TR, "Out of Send Buffer space in NDB API" },
   { 4022, TR, "Out of Send Buffer space in NDB API" },
   { 4032, TR, "Out of Send Buffer space in NDB API" },
-
+  {  288, TR, "Out of index operations in transaction coordinator (increase
MaxNoOfConcurrentIndexOperations)" },
   /**
    * InsufficientSpace
    */

--- 1.19/ndb/test/run-test/Makefile.am	2005-02-16 04:13:09 -08:00
+++ 1.20/ndb/test/run-test/Makefile.am	2005-05-09 09:43:43 -07:00
@@ -6,7 +6,12 @@
 include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
 
 test_PROGRAMS = atrt
-test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt
+test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
+          conf-daily-basic-ndbmaster.txt \
+          conf-daily-basic-shark.txt \
+          conf-daily-devel-ndbmaster.txt \
+          conf-daily-sql-ndbmaster.txt \
+          conf-daily-basic-dl145a.txt
 test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
           atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh