diff options
author | ale <ale@FreeBSD.org> | 2005-04-11 16:47:36 +0800 |
---|---|---|
committer | ale <ale@FreeBSD.org> | 2005-04-11 16:47:36 +0800 |
commit | f43d5129413a943d42ec8fdd28e33cd4484d8b57 (patch) | |
tree | 0f8051bce1a72d00f301e444932a272e9ff78976 /databases/mysql41-server/files | |
parent | 6cbdf95ce8cb502c177fb8327b89d0a58b9d167d (diff) | |
download | freebsd-ports-graphics-f43d5129413a943d42ec8fdd28e33cd4484d8b57.tar.gz freebsd-ports-graphics-f43d5129413a943d42ec8fdd28e33cd4484d8b57.tar.zst freebsd-ports-graphics-f43d5129413a943d42ec8fdd28e33cd4484d8b57.zip |
- 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 e5870bdc1c9..93bd177f98b 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 00000000000..5061f9df680 --- /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__) |