bk commit into 5.0 tree (jonas:1.2170)

[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
  1.2170 06/05/30 14:02:05 jonas@stripped +2 -0
  ndb - atrt
    fix bug with nothing generated and cC

  ndb/test/run-test/files.cpp
    1.3 06/05/30 14:02:02 jonas@stripped +41 -37
    fix problem with nothing generated and cC

  ndb/test/run-test/example-my.cnf
    1.2 06/05/30 14:02:02 jonas@stripped +2 -0
    skip-bdb

# 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-atrt

--- 1.1/ndb/test/run-test/example-my.cnf	2006-05-30 09:10:45 +02:00
+++ 1.2/ndb/test/run-test/example-my.cnf	2006-05-30 14:02:02 +02:00
@@ -29,6 +29,8 @@
 
 [mysqld]
 skip-innodb
+skip-bdb
+
 #
 # Generated by atrt
 # Mon May 29 23:27:49 2006

--- 1.2/ndb/test/run-test/files.cpp	2006-05-29 14:37:03 +02:00
+++ 1.3/ndb/test/run-test/files.cpp	2006-05-30 14:02:02 +02:00
@@ -116,11 +116,7 @@
   BaseString mycnf;
   mycnf.assfmt("%s/my.cnf", g_basedir);
   
-  if (mycnf == g_my_cnf)
-  {
-    setup = 1;
-  }
-  else
+  if (mycnf != g_my_cnf)
   {
     struct stat sbuf;
     int ret = lstat(mycnf.c_str(), &sbuf);
@@ -141,7 +137,6 @@
       g_logger.error("Failed to '%s'", cp.c_str());
       return false;
     }
-    setup = 1;
   }
   
   if (setup == 2 || config.m_generated)
@@ -198,41 +193,46 @@
   for (size_t i = 0; i < config.m_clusters.size(); i++)
   {
     atrt_cluster& cluster = *config.m_clusters[i];
-    Properties::Iterator it(&cluster.m_options.m_generated);
-    printfile(out, cluster.m_options.m_generated,
-	      "[mysql_cluster%s]", cluster.m_name.c_str());
-    
+    if (out)
+    {
+      Properties::Iterator it(&cluster.m_options.m_generated);
+      printfile(out, cluster.m_options.m_generated,
+		"[mysql_cluster%s]", cluster.m_name.c_str());
+    }
+      
     for (size_t j = 0; j<cluster.m_processes.size(); j++)
     {
       atrt_process& proc = *cluster.m_processes[j];
       
-      
-      switch(proc.m_type){
-      case atrt_process::AP_NDB_MGMD:
-	printfile(out, proc.m_options.m_generated,
-		  "[cluster_config.ndb_mgmd.%d%s]", 
-		  proc.m_index, proc.m_cluster->m_name.c_str());
-	break;
-      case atrt_process::AP_NDBD: 
-	printfile(out, proc.m_options.m_generated,
-		  "[cluster_config.ndbd.%d%s]",
-		  proc.m_index, proc.m_cluster->m_name.c_str());
-	break;
-      case atrt_process::AP_MYSQLD:
-	printfile(out, proc.m_options.m_generated,
-		  "[mysqld.%d%s]",
-		  proc.m_index, proc.m_cluster->m_name.c_str());
-	break;
-      case atrt_process::AP_NDB_API:
-	break;
-      case atrt_process::AP_CLIENT:
-	printfile(out, proc.m_options.m_generated,
-		  "[client.%d%s]",
-		  proc.m_index, proc.m_cluster->m_name.c_str());
-	break;
-      case atrt_process::AP_ALL:
-      case atrt_process::AP_CLUSTER:
-	abort();
+      if (out)
+      {
+	switch(proc.m_type){
+	case atrt_process::AP_NDB_MGMD:
+	  printfile(out, proc.m_options.m_generated,
+		    "[cluster_config.ndb_mgmd.%d%s]", 
+		    proc.m_index, proc.m_cluster->m_name.c_str());
+	  break;
+	case atrt_process::AP_NDBD: 
+	  printfile(out, proc.m_options.m_generated,
+		    "[cluster_config.ndbd.%d%s]",
+		    proc.m_index, proc.m_cluster->m_name.c_str());
+	  break;
+	case atrt_process::AP_MYSQLD:
+	  printfile(out, proc.m_options.m_generated,
+		    "[mysqld.%d%s]",
+		    proc.m_index, proc.m_cluster->m_name.c_str());
+	  break;
+	case atrt_process::AP_NDB_API:
+	  break;
+	case atrt_process::AP_CLIENT:
+	  printfile(out, proc.m_options.m_generated,
+		    "[client.%d%s]",
+		    proc.m_index, proc.m_cluster->m_name.c_str());
+	  break;
+	case atrt_process::AP_ALL:
+	case atrt_process::AP_CLUSTER:
+	  abort();
+	}
       }
       
       /**
@@ -278,7 +278,11 @@
   }
   
   if (out)
+  {
+    fflush(out);
     fclose(out);
+  }
+
   return true;
 }