bzr commit into mysql-5.1 branch (jonas:3034)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/

 3034 Jonas Oreland	2008-11-03
      ndb - atrt
        don't put CMD in environment, as we then overflow Parser::m_tokenBuffer (size==512)
        but write CMD directly into env.sh (only used there)
      
        this is a hack, we should somehow make the token-buffer dynamic...
        this fixes that autotest refuses to start in 6.4 (where CMD has grown in size)
modified:
  storage/ndb/test/run-test/files.cpp
  storage/ndb/test/run-test/setup.cpp

=== modified file 'storage/ndb/test/run-test/files.cpp'
--- a/storage/ndb/test/run-test/files.cpp	2008-08-23 20:29:50 +0000
+++ b/storage/ndb/test/run-test/files.cpp	2008-11-03 12:33:34 +0000
@@ -242,7 +242,7 @@ setup_files(atrt_config& config, int set
       BaseString tmp;
       tmp.assfmt("%s/env.sh", proc.m_proc.m_cwd.c_str());
       char **env = BaseString::argify(0, proc.m_proc.m_env.c_str());
-      if (env[0])
+      if (env[0] || proc.m_proc.m_path.length())
       {
 	Vector<BaseString> keys;
 	FILE *fenv = fopen(tmp.c_str(), "w+");
@@ -261,6 +261,16 @@ setup_files(atrt_config& config, int set
 	  keys.push_back(env[k]);
 	  free(env[k]);
 	}
+	if (proc.m_proc.m_path.length())
+	{
+	  fprintf(fenv, "CMD=\"%s", proc.m_proc.m_path.c_str());
+	  if (proc.m_proc.m_args.length())
+	  {
+	    fprintf(fenv, " %s", proc.m_proc.m_args.c_str());
+	  }
+	  fprintf(fenv, "\"\nexport CMD\n");
+	}
+	
 	fprintf(fenv, "PATH=%s/bin:%s/libexec:$PATH\n", g_prefix, g_prefix);
 	keys.push_back("PATH");
 	for (size_t k = 0; k<keys.size(); k++)

=== modified file 'storage/ndb/test/run-test/setup.cpp'
--- a/storage/ndb/test/run-test/setup.cpp	2008-10-28 15:18:33 +0000
+++ b/storage/ndb/test/run-test/setup.cpp	2008-11-03 12:33:34 +0000
@@ -371,15 +371,6 @@ load_process(atrt_config& config, atrt_c
     return false;
   }
   
-  if (proc.m_proc.m_path.length())
-  {
-    proc.m_proc.m_env.appfmt(" CMD=\"%s", proc.m_proc.m_path.c_str());
-    if (proc.m_proc.m_args.length())
-      proc.m_proc.m_env.append(" ");
-    proc.m_proc.m_env.append(proc.m_proc.m_args);
-    proc.m_proc.m_env.append("\" ");
-  }
-  
   if (type == atrt_process::AP_MYSQLD)
   {
     /**