diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-01-26 12:13:59 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-01-26 12:13:59 -0800 |
| commit | 0f038a3bd8ba4242c2e918dddb30a65ac5c8d9a4 (patch) | |
| tree | f73b4d44652c241666920a49fca011ee4c4ada49 /scripts/mysqld_multi.sh | |
| parent | 48b8edc2ad6c64b2e131c792312c9eff6d252b95 (diff) | |
| parent | 0c75fbb3c4e610f9fd69acf2753acfd388dff352 (diff) | |
| download | mariadb-git-0f038a3bd8ba4242c2e918dddb30a65ac5c8d9a4.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
scripts/mysqld_multi.sh:
Auto merged
mysys/default.c:
SCCS merged
Diffstat (limited to 'scripts/mysqld_multi.sh')
| -rw-r--r-- | scripts/mysqld_multi.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 91afe49b46b..5f1b0e0571c 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -490,14 +490,6 @@ sub find_groups { $data[$i] = $line; } - if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf") - { - open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF); - } - for (; ($line = shift @tmp); $i++) - { - $data[$i] = $line; - } if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf") { open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF); |