bk commit into 5.0 tree (jani:1.1892) BUG#9834

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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.1892 05/04/26 17:46:43 jani@stripped +1 -0
  Fixed Bug#9834, "mysqld_multi --config-file parameter requires
  absolute path".

  scripts/mysqld_multi.sh
    1.25 05/04/26 17:46:38 jani@stripped +10 -1
    Fixed Bug#9834, "mysqld_multi --config-file parameter requires
    absolute path".

# 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:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.24/scripts/mysqld_multi.sh	2005-04-26 16:16:33 +03:00
+++ 1.25/scripts/mysqld_multi.sh	2005-04-26 17:46:38 +03:00
@@ -66,6 +66,11 @@
 	else
 	{
 	  $opt_config_file= $1;
+	  if (!($opt_config_file =~ m/\//))
+	  {
+	    # No path. Use current working directory
+	    $opt_config_file= "./" . $opt_config_file;
+	  }
 	}
       }
     }
@@ -82,7 +87,11 @@
   {
     $flag_exit= 1;
   }
-
+  if (!($opt_config_file =~ m/\//))
+  {
+    # No path. Use current working directory
+    $opt_config_file= "./" . $opt_config_file;
+  }
   usage() if ($opt_help);
 
   if ($opt_verbose && $opt_silent)