diff options
| author | unknown <jani@prima.mysql.com> | 2000-12-07 15:57:58 +0200 |
|---|---|---|
| committer | unknown <jani@prima.mysql.com> | 2000-12-07 15:57:58 +0200 |
| commit | 54649a94c554969f2de158338f738db30696abac (patch) | |
| tree | abacdfd8de55d4a41fc17004111cfee92477ef36 /scripts | |
| parent | d4fb3eecf2f7055c82d56202a4abdbc1212d48dc (diff) | |
| download | mariadb-git-54649a94c554969f2de158338f738db30696abac.tar.gz | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 7 | ||||
| -rwxr-xr-x | scripts/mysqld_multi.sh (renamed from scripts/mysql_multi_mysqld) | 12 |
2 files changed, 11 insertions, 8 deletions
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 |