diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 11 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 43 |
2 files changed, 10 insertions, 44 deletions
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 19a5fb7276b..e58d44f336b 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -294,14 +294,19 @@ done # support files # mkdir $BASE/support-files -cp support-files/*.cnf $BASE/support-files + +# Rename the cnf files to <file>.ini +for i in support-files/*.cnf +do + i=`echo $i | sed 's/.cnf$//g'` + cp $i.cnf $BASE/$i.ini +done # # Raw dirs from source tree # -for i in Docs/Flags scripts sql-bench SSL \ - tests +for i in scripts sql-bench SSL tests do print_debug "Copying directory '$i'" if [ -d $i ] diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 9767976460c..b2931468e82 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -4,7 +4,7 @@ use Getopt::Long; use POSIX qw(strftime); $|=1; -$VER="2.7"; +$VER="2.8"; $opt_config_file = undef(); $opt_example = 0; @@ -78,7 +78,7 @@ sub main "config-file=s","user=s","password=s","log=s","no-log","tcp-ip") || die "Wrong option! See $my_progname --help for detailed information!\n"; - init_log(); + init_log() if (!defined($opt_log)); $groupids = $ARGV[1]; if ($opt_version) { @@ -180,45 +180,6 @@ sub init_log } #### -#### Init log file. Check for appropriate place for log file, in the following -#### order my_print_defaults mysqld datadir, @datadir@, /var/log, /tmp -#### - -sub init_log -{ - if ($my_print_defaults_exists) - { - @mysqld_opts= `my_print_defaults mysqld`; - chomp @mysqld_opts; - foreach my $opt (@mysqld_opts) - { - if ($opt =~ m/^\-\-datadir[=](.*)/) - { - if (-d "$1" && -w "$1") - { - $logdir= $1; - } - } - } - } - if (!defined($logdir)) - { - $logdir= "@datadir@" if (-d "@datadir@" && -w "@datadir@"); - } - if (!defined($logdir)) - { - # Log file was not specified and we could not log to a standard place, - # so log file be disabled for now. - print "WARNING: Log file disabled. Maybe directory/file isn't writable?\n"; - $opt_no_log= 1; - } - else - { - $opt_log= "$logdir/mysqld_multi.log"; - } -} - -#### #### Report living and not running MySQL servers #### |