diff options
author | Alex Dupre <ale@FreeBSD.org> | 2005-04-11 08:47:36 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2005-04-11 08:47:36 +0000 |
commit | f93aa4f2311e5b164e7704a47ce36fb8d1ed661d (patch) | |
tree | e4c31532a6e4b548b4c3628b6a6c98144a828c84 /databases/mysql41-server/files | |
parent | - List missing locales (diff) |
- Use the rcNG script to kill MySQL on deinstallation [1]
- Set the new sequence for finding my.cnf files [2]:
/etc, ${PREFIX}/etc, ${mysql_dbdir}
(default to: /etc/my.cnf, /usr/local/etc/my.cnf, /var/db/mysql/my.cnf)
PR: ports/79166 [1], ports/79597 [2]
Submitted by: Sergey Prikhodko <sergey@network-asp.biz> [1],
Vasil Dimov <vd@datamax.bg> [2]
Diffstat (limited to 'databases/mysql41-server/files')
-rw-r--r-- | databases/mysql41-server/files/mysql-server.sh.in | 2 | ||||
-rw-r--r-- | databases/mysql41-server/files/patch-mysys_default.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.sh.in index e5870bdc1c9a..93bd177f98b3 100644 --- a/databases/mysql41-server/files/mysql-server.sh.in +++ b/databases/mysql41-server/files/mysql-server.sh.in @@ -37,7 +37,7 @@ mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" pidfile="${mysql_dbdir}/`/bin/hostname`.pid" command="%%PREFIX%%/bin/mysqld_safe" -command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &" +command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" diff --git a/databases/mysql41-server/files/patch-mysys_default.c b/databases/mysql41-server/files/patch-mysys_default.c new file mode 100644 index 000000000000..5061f9df6801 --- /dev/null +++ b/databases/mysql41-server/files/patch-mysys_default.c @@ -0,0 +1,13 @@ +--- mysys/default.c.orig Fri Apr 8 10:48:24 2005 ++++ mysys/default.c Fri Apr 8 10:53:25 2005 +@@ -49,9 +49,7 @@ + "sys:/etc/", + #else + "/etc/", +-#endif +-#ifdef DATADIR +-DATADIR, ++"%%PREFIX%%/etc/", + #endif + "", /* Place for defaults_extra_dir */ + #if !defined(__WIN__) && !defined(__NETWARE__) |