Changed name mysql_multi_mysqld to mysqld_multi.

Docs/manual.texi:
  Changed name mysql_multi_mysqld to mysqld_multi.
  This is because safe_mysqld will be converted to mysqld_safe
  in the future and the new name is shorter than the old one.
scripts/Makefile.am:
  Added mysqld_multi
scripts/mysqld_multi.sh:
  Changed name from mysql_multi_mysqld to mysqld_multi

3 files changed, 30 insertions, 27 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index a7ee859bf71..ea5acbd8ec4 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -604,7 +604,7 @@ MySQL Utilites
 
 * Programs::                    What do the executables do?
 * safe_mysqld::                 
-* mysql_multi_mysqld::          Program for managing multiple @strong{MySQL} servers
+* mysqld_multi::                Program for managing multiple @strong{MySQL} servers
 * mysql::                       The command line tool
 * mysqladmin::                  Administering a @strong{MySQL} server
 * mysqldump::                   Dumping the structure and data from @strong{MySQL} databases and tables
@@ -28096,7 +28096,7 @@ How big a @code{VARCHAR} column can be
 @menu
 * Programs::                    What do the executables do?
 * safe_mysqld::                 
-* mysql_multi_mysqld::          Program for managing multiple @strong{MySQL} servers
+* mysqld_multi::                Program for managing multiple @strong{MySQL} servers
 * mysql::                       The command line tool
 * mysqladmin::                  Administering a @strong{MySQL} server
 * mysqldump::                   Dumping the structure and data from @strong{MySQL} databases and tables
@@ -28234,7 +28234,7 @@ shell> replace a b b a -- file1 file2 ...
 @cindex tools, safe_mysqld
 @cindex scripts
 @cindex @code{safe_mysqld}
-@node safe_mysqld, mysql_multi_mysqld, Programs, Tools
+@node safe_mysqld, mysqld_multi, Programs, Tools
 @section safe_mysqld, the wrapper around mysqld
 
 @code{safe_mysqld} is the recommended way to start a @code{mysqld}
@@ -28324,13 +28324,13 @@ upgrade @strong{MySQL} in the future, your modified version of
 @code{safe_mysqld} will be overwritten, so you should make a copy of your
 edited version that you can reinstall.
 
-@cindex tools, mysql_multi_mysqld
+@cindex tools, mysqld_multi
 @cindex scripts
-@cindex @code{mysql_multi_mysqld}
-@node  mysql_multi_mysqld, mysql, safe_mysqld, Tools
-@section mysql_multi_mysqld, program for managing multiple @code{MySQL} servers
+@cindex @code{mysqld_multi}
+@node  mysqld_multi, mysql, safe_mysqld, Tools
+@section mysqld_multi, program for managing multiple @code{MySQL} servers
 
-@code{mysql_multi_mysqld} is meant for managing several @code{mysqld}
+@code{mysqld_multi} is meant for managing several @code{mysqld}
 processes running in different UNIX sockets and TCP/IP ports.
 
 The program will search for group(s) named [mysqld#] from my.cnf (or the
@@ -28344,8 +28344,8 @@ stopping, or reporting some specific @code{mysqld} servers with this
 program. See the usage and options below for more information.
 
 @example
-Usage: mysql_multi_mysqld [OPTIONS] @{start|stop|report@} [GNR,GNR,GNR...]
-or     mysql_multi_mysqld [OPTIONS] @{start|stop|report@} [GNR-GNR,GNR,GNR-GNR,...]
+Usage: mysqld_multi [OPTIONS] @{start|stop|report@} [GNR,GNR,GNR...]
+or     mysqld_multi [OPTIONS] @{start|stop|report@} [GNR-GNR,GNR,GNR-GNR,...]
 @end example
 
 The GNR above means the group number. You can start, stop or report
@@ -28356,13 +28356,13 @@ GNR argument all the found groups will be either started, stopped, or
 reported. Note that you must not have any white spaces in the GNR
 list. Anything after a white space are ignored.
 
-@code{mysql_multi_mysqld} supports the following options:
+@code{mysqld_multi} supports the following options:
 
 @table @code
 @cindex config-file option
 @item --config-file=...  
 Alternative config file. NOTE: This will not affect this program's own
-options (group @code{[mysql_multi_mysqld]}), but only groups
+options (group @code{[mysqld_multi]}), but only groups
 [mysqld#]. Without this option everything will be searched from the
 ordinary my.cnf file.
 @cindex example option
@@ -28405,7 +28405,7 @@ via the TCP/IP port.  By default connecting is done via the UNIX socket.
 Print the version number and exit.
 @end table
 
-Some notes about @code{mysql_multi_mysqld}:
+Some notes about @code{mysqld_multi}:
 
 @itemize @bullet
 @item
@@ -28433,7 +28433,7 @@ it, if a @code{mysqld} process fails due to signal kill -9, or
 similar. (Like segmentation fault, which @strong{MySQL} should never do,
 of course ;) Please note that @code{safe_mysqld} script may require that
 you start it from a certain place. This means that you may have to CD to
-a certain directory, before you start the @code{mysql_multi_mysqld}. If
+a certain directory, before you start the @code{mysqld_multi}. If
 you have problems starting, please see the @code{safe_mysqld}
 script. Check especially the lines:
 @example
@@ -28460,7 +28460,7 @@ When you want to refer to a certain group using GNR with this program,
 just use the number in the end of the group name ( [mysqld# <== ).
 @item
 You may want to use option '--user' for @code{mysqld}, but in order to
-do this you need to be root when you start the @code{mysql_multi_mysqld}
+do this you need to be root when you start the @code{mysqld_multi}
 script. Having the option in the config file doesn't matter; you will
 just get a warning, if you are not the superuser and the @code{mysqlds}
 are started under @strong{YOUR} UNIX account. @strong{IMPORTANT}: Make
@@ -28477,13 +28477,13 @@ YOU WANT} to have separate @code{mysqld} processes. Starting multiple
 performance in a threaded system!
 @end itemize
 
-This is an example of the config file on behalf of @code{mysql_multi_mysqld}. 
+This is an example of the config file on behalf of @code{mysqld_multi}. 
 
 @example
 # This file should probably be in your home dir (~/.my.cnf) or /etc/my.cnf
 # Version 2.1 by Jani Tolonen
 
-[mysql_multi_mysqld]
+[mysqld_multi]
 mysqld     = /usr/local/bin/safe_mysqld
 mysqladmin = /usr/local/bin/mysqladmin
 user       = multi_admin
@@ -28526,7 +28526,7 @@ user       = jani
 @cindex tools, command line
 @cindex scripts
 @cindex @code{mysql}
-@node mysql, mysqladmin, mysql_multi_mysqld, Tools
+@node mysql, mysqladmin, mysqld_multi, Tools
 @section The Command-line Tool
 
 @code{mysql} is a simple SQL shell (with GNU @code{readline} capabilities).
@@ -39592,7 +39592,7 @@ the link and the original database is deleted.
 @item
 Fixed that @code{DROP DATABASE} works on OS/2.
 @item
-New client @code{mysql_multi_mysqld}. @xref{mysql_multi_mysqld}.
+New client @code{mysqld_multi}. @xref{mysqld_multi}.
 @item
 Fixed bug when doing a @code{SELECT DISTINCT ... table1 LEFT JOIN
 table2..} when table2 was empty.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ec1b33fb42b..cced1944d9e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -27,7 +27,8 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysql_convert_table_format \
 			mysql_find_rows \
 			mysqlhotcopy \
-			mysqldumpslow
+			mysqldumpslow \
+			mysqld_multi
 
 EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			msql2mysql.sh \
@@ -42,6 +43,7 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysql_find_rows.sh \
 			mysqlhotcopy.sh \
 		        mysqldumpslow.sh \
+			mysqld_multi \
 			safe_mysqld.sh
 
 EXTRA_DIST =		$(EXTRA_SCRIPTS) \
@@ -63,7 +65,8 @@ CLEANFILES =		@server_scripts@ \
 			mysql_convert_table_format \
 			mysql_find_rows \
 			mysqlhotcopy \
-			mysqldumpslow
+			mysqldumpslow \
+			mysqld_multi
 
 SUPERCLEANFILES =	mysqlbug
 
diff --git a/scripts/mysql_multi_mysqld b/scripts/mysqld_multi.sh
index 48e72a00aa5..d96828cee4d 100755
--- a/scripts/mysql_multi_mysqld
+++ b/scripts/mysqld_multi.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 use Getopt::Long;
 use POSIX qw(strftime);
@@ -9,7 +9,7 @@ $VER="2.1";
 $opt_config_file   = undef();
 $opt_example       = 0;
 $opt_help          = 0;
-$opt_log           = "/tmp/mysql_multi_mysqld.log";
+$opt_log           = "/tmp/mysqld_multi.log";
 $opt_mysqladmin    = "mysqladmin";
 $opt_mysqld        = "mysqld";
 $opt_no_log        = 0;
@@ -43,7 +43,7 @@ sub main
     print "in your path. The command is available from the latest\n";
     print "MySQL distribution.\n";
   }
-  my @defops = `my_print_defaults mysql_multi_mysqld`;
+  my @defops = `my_print_defaults mysqld_multi`;
   chop @defops;
   splice @ARGV, 0, 0, @defops;
   GetOptions("help","example","version","mysqld=s","mysqladmin=s",
@@ -493,7 +493,7 @@ sub example
 #   give you extra performance in a threaded system! It takes too much space
 #   to describe everything here, please consult the MySQL manual.
 #
-[mysql_multi_mysqld]
+[mysqld_multi]
 mysqld     = /usr/local/bin/safe_mysqld
 mysqladmin = /usr/local/bin/mysqladmin
 user       = multi_admin
@@ -550,7 +550,7 @@ Description:
 $my_progname can be used to start, or stop any number of separate
 mysqld processes running in different TCP/IP ports and UNIX sockets.
 
-This program can read group [mysql_multi_mysqld] from my.cnf file.
+This program can read group [mysqld_multi] from my.cnf file.
 You may want to put options mysqld=... and mysqladmin=... there.
 
 The program will search for group(s) named [mysqld#] from my.cnf (or
@@ -576,7 +576,7 @@ list. Anything after a white space are ignored.
 
 Options:
 --config-file=...  Alternative config file. NOTE: This will not affect
-                   this program's own options (group [mysql_multi_mysqld]),
+                   this program's own options (group [mysqld_multi]),
                    but only groups [mysqld#]. Without this option everything
                    will be searched from the ordinary my.cnf file.
                    Using: $opt_config_file