diff options
| author | flo <flo@FreeBSD.org> | 2013-04-27 04:47:28 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-04-27 04:47:28 +0800 |
| commit | e0b4baa4300287b9ae71b03022867689ae3e8a28 (patch) | |
| tree | e619e8e58e6205fe492a3f1d1ccf1198c992fd25 /databases | |
| parent | 0068a8a89d5baf4dd73c4d0ca465f11f620488a5 (diff) | |
| download | freebsd-ports-gnome-e0b4baa4300287b9ae71b03022867689ae3e8a28.tar.gz freebsd-ports-gnome-e0b4baa4300287b9ae71b03022867689ae3e8a28.tar.zst freebsd-ports-gnome-e0b4baa4300287b9ae71b03022867689ae3e8a28.zip | |
Merge optimizations to the rc script from r316439 and r316532.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/percona55-server/files/mysql-server.in | 8 | ||||
| -rw-r--r-- | databases/percona56-server/files/mysql-server.in | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/databases/percona55-server/files/mysql-server.in b/databases/percona55-server/files/mysql-server.in index fa701dcca45b..d2cdc080e216 100644 --- a/databases/percona55-server/files/mysql-server.in +++ b/databases/percona55-server/files/mysql-server.in @@ -16,6 +16,8 @@ # just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. +# mysql_optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". # mysql_pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_args (str): Custom additional arguments to be passed @@ -32,12 +34,14 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" -pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} +: ${hostname:=`/bin/hostname`} +pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" diff --git a/databases/percona56-server/files/mysql-server.in b/databases/percona56-server/files/mysql-server.in index fa701dcca45b..d2cdc080e216 100644 --- a/databases/percona56-server/files/mysql-server.in +++ b/databases/percona56-server/files/mysql-server.in @@ -16,6 +16,8 @@ # just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. +# mysql_optfile (str): Server-specific option file. +# Default to "${mysql_dbdir}/my.cnf". # mysql_pidfile (str): Custum PID file path and name. # Default to "${mysql_dbdir}/${hostname}.pid". # mysql_args (str): Custom additional arguments to be passed @@ -32,12 +34,14 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} +: ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" -pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} +: ${hostname:=`/bin/hostname`} +pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" |