bk commit into 4.0 tree (pkarthick:1.2162)

[pkarthick]

Below is the list of changes that have just been committed into a local
4.0 repository of prem. When prem 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.2162 05/11/30 12:24:42 pkarthick@stripped +1 -0
  NetWare specific change, to make multiple instances of MySQLD work when loaded one after another from an ncf file.

  netware/mysqld_safe.c
    1.9 05/11/30 12:24:41 pkarthick@stripped +13 -20
    NetWare specific change, to make multiple instances of MySQLD work when loaded one after another from an ncf file.

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/Sawtooth_SP2_

--- 1.8/netware/mysqld_safe.c	2004-01-29 22:09:00 +05:30
+++ 1.9/netware/mysqld_safe.c	2005-11-30 12:24:41 +05:30
@@ -271,34 +271,27 @@
 ******************************************************************************/
 void read_defaults(arg_list_t *pal)
 {
-  arg_list_t al;
-  char defaults_file[PATH_MAX];
   char mydefaults[PATH_MAX];
+	char mydefaults_command[2*PATH_MAX];
   char line[PATH_MAX];
   FILE *fp;
   
-	// defaults output file
-	snprintf(defaults_file, PATH_MAX, "%s/bin/defaults.out", basedir);
-	remove(defaults_file);
-
-	// mysqladmin file
+	// mydefaults file
   snprintf(mydefaults, PATH_MAX, "%s/bin/my_print_defaults", basedir);
 	
   // args
-  init_args(&al);
-  add_arg(&al, mydefaults);
-  if (default_option[0]) add_arg(&al, default_option);
-  add_arg(&al, "mysqld");
-  add_arg(&al, "server");
-  add_arg(&al, "mysqld_safe");
-  add_arg(&al, "safe_mysqld");
-
-	spawn(mydefaults, &al, TRUE, NULL, defaults_file, NULL);
-
-  free_args(&al);
-
+  if (default_option[0]) 
+  {
+    snprintf(mydefaults_command, 2*PATH_MAX, "%s %s mysqld server mysqld_safe safe_mysqld", mydefaults, default_option);
+  }
+  else
+  {
+    snprintf(mydefaults_command, PATH_MAX, "%s mysqld server mysqld_safe safe_mysqld", mydefaults);
+  }
+  consoleprintf("\n\n%d @ %s PATH_MAX[%d] 2*PATH_MAX[%d]\n", __LINE__, __FILE__, PATH_MAX, (PATH_MAX*2));
+  consoleprintf("%d @ %s COMMAND[%s]\n\n", __LINE__, __FILE__, mydefaults_command);
 	// gather defaults
-	if((fp = fopen(defaults_file, "r")) != NULL)
+	if((fp = popen(mydefaults_command, "r")) != NULL)
 	{
 	  while(fgets(line, PATH_MAX, fp))
 	  {