diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2006-02-05 16:59:03 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2006-02-05 16:59:03 +0000 |
| commit | 854c892e647e1de64f33890449f35441ae414d5e (patch) | |
| tree | 11b4076345b47bae7f8e0f30ad3ef6ea0b855400 | |
| parent | Stable on alpha wrt security bug #120985 (diff) | |
| download | gentoo-2-854c892e647e1de64f33890449f35441ae414d5e.tar.gz gentoo-2-854c892e647e1de64f33890449f35441ae414d5e.tar.bz2 gentoo-2-854c892e647e1de64f33890449f35441ae414d5e.zip | |
fix bug #121648 problems stopping mysql under bsd
(Portage version: 2.1_pre4-r1)
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-slot.rc6-r3 | 6 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysqlmanager-slot.rc6 | 9 |
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 843906eac6b0..7dac5c3515dd 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.299 2006/02/04 02:21:14 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.300 2006/02/05 16:59:03 vivo Exp $ + + 05 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r3, + files/mysqlmanager-slot.rc6: + fix bug #121648 problems stopping mysql under bsd 04 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r3: Fix for Bug #121461, plus minor cleanup. diff --git a/dev-db/mysql/files/mysql-slot.rc6-r3 b/dev-db/mysql/files/mysql-slot.rc6-r3 index e46baccdf6de..217f74b056ef 100644 --- a/dev-db/mysql/files/mysql-slot.rc6-r3 +++ b/dev-db/mysql/files/mysql-slot.rc6-r3 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r3,v 1.2 2006/02/04 02:21:15 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r3,v 1.3 2006/02/05 16:59:03 vivo Exp $ # external binaryes used: which, sed, tac @@ -42,7 +42,7 @@ get_slot_config() { MY_SUFFIX="-${srv_slot}" # srv=array(0 => [srv_slot], 1 => [srv_num] ) srv=( ${srv_slot} ${srv_num} ) - + local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" local conf_d_parameters="${!tmp_eval}" if [[ "${srv_slot}" == "0" ]] ; then @@ -321,7 +321,7 @@ stop() { local runwhat pidfile shutdown_elem local PID cnt timeout=${STOPTIMEOUT:-"120"} local retstatus=0 - local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")" + local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" ebegin "Stopping ${myservice} (pid=${PID})" for shutdown_elem in $shutdown_list; do diff --git a/dev-db/mysql/files/mysqlmanager-slot.rc6 b/dev-db/mysql/files/mysqlmanager-slot.rc6 index 935d3d592ca7..8d55103cb00d 100644 --- a/dev-db/mysql/files/mysqlmanager-slot.rc6 +++ b/dev-db/mysql/files/mysqlmanager-slot.rc6 @@ -1,12 +1,13 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.2 2005/12/08 17:44:12 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.3 2006/02/05 16:59:03 vivo Exp $ # external binaryes used: which, sed, tac depend() { use dns net localmount netmount nfsmount + #provide mysql } # int in_list(char * elem, char * list) @@ -62,7 +63,7 @@ get_slot_config() { ;; esac done - + if [[ ! -r "${MY_CNF}" ]]; then ewarn "Cannot access ${MY_CNF} !" MY_CNF="" @@ -72,7 +73,7 @@ get_slot_config() { if [[ ! -x "${my_print_defaults}" ]]; then eerror "my_print_defaults NOT found or not executable" my_defaults="" - else + else my_defaults=$( ${my_print_defaults} \ --loose-verbose \ --config-file="${MY_CNF}" \ @@ -200,7 +201,7 @@ stop () { local runwhat pidfile shutdown_elem local PID cnt timeout local retstatus=0 - local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")" + local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" # shutdown in reverse order ebegin |