From 942607bce9ed897c18199648f34f82b7bdba0bb5 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 12 Jan 2005 17:53:54 +0000 Subject: [PATCH] Fix for bz#143724. --- mysql.init | 5 ++++- mysql.spec | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mysql.init b/mysql.init index 91d93d8..b0ee125 100644 --- a/mysql.init +++ b/mysql.init @@ -67,7 +67,10 @@ start(){ fi chown -R mysql:mysql "$datadir" chmod 0755 "$datadir" - /usr/bin/mysqld_safe --defaults-file=/etc/my.cnf >/dev/null 2>&1 & + # The reason for explicitly specifying --pid-file is that there may + # be no such entry in my.cnf, and the default behavior will be to not + # create it at all... + /usr/bin/mysqld_safe --defaults-file=/etc/my.cnf --pid-file="$mypidfile" >/dev/null 2>&1 & ret=$? # Spin for a maximum of N seconds waiting for the server to come up. # Rather than assuming we know a valid username, accept an "access diff --git a/mysql.spec b/mysql.spec index 384227a..60c56b3 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 4.1.7 -Release: 9 +Release: 10 Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz Source1: mysql.init Source2: mysql.logrotate @@ -357,6 +357,9 @@ fi %{_datadir}/sql-bench %changelog +* Wed Jan 12 2005 Tom Lane 4.1.7-10 +- Don't assume /etc/my.cnf will specify pid-file (bz#143724) + * Wed Jan 12 2005 Tim Waugh 4.1.7-9 - Rebuilt for new readline. @@ -372,7 +375,7 @@ fi - Enable SSL (bz#142032) * Thu Dec 2 2004 Tom Lane 4.1.7-5 -- Add a restorecon to keep the mysql.log file in the right context +- Add a restorecon to keep the mysql.log file in the right context (bz#143887) * Tue Nov 23 2004 Tom Lane 4.1.7-4 - Turn off old_passwords in default /etc/my.cnf file, for better compatibility