database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
This commit is contained in:
df@kahlann.erinye.com
2006-12-07 15:13:12 +01:00
parent 41a2a6080c 77965c013c
commit bb1297cdc3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysqld_multi.sh
View File

@ -464,9 +464,9 @@ sub find_groups
}
else
{
if (-f "/etc/my.cnf" && -r "/etc/my.cnf")
if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
{
open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
}
for ($i = 0; ($line = shift @tmp); $i++)
{
@ -703,7 +703,7 @@ sub example
# (as per Linux/Unix standard). You may even replace the
# /etc/init.d/mysql.server script with it.
#
# Before using, you must create a my.cnf file either in /etc/my.cnf
# Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf
# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
#
# The script can be found from support-files/mysqld_multi.server.sh