From cafb0a92aec9aa91a30f79cb38ee8f6edbba371b Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 9 Feb 2006 21:25:10 +0000 Subject: [PATCH] err-log option has been renamed to log-error, fix my.cnf and initscript --- my.cnf | 2 +- mysql.init | 7 ++++--- mysql.spec | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/my.cnf b/my.cnf index 1423e03..2543388 100644 --- a/my.cnf +++ b/my.cnf @@ -10,5 +10,5 @@ user=mysql basedir=/var/lib [mysqld_safe] -err-log=/var/log/mysqld.log +log-error=/var/log/mysqld.log pid-file=/var/run/mysqld/mysqld.pid diff --git a/mysql.init b/mysql.init index 7504156..c6041d6 100644 --- a/mysql.init +++ b/mysql.init @@ -47,7 +47,7 @@ get_mysql_option /etc/my.cnf datadir "/var/lib/mysql" datadir="$result" get_mysql_option /etc/my.cnf socket "$datadir/mysql.sock" socketfile="$result" -get_mysql_option /etc/my.cnf err-log "/var/log/mysqld.log" +get_mysql_option /etc/my.cnf log-error "/var/log/mysqld.log" errlogfile="$result" get_mysql_option /etc/my.cnf pid-file "/var/run/mysqld/mysqld.pid" mypidfile="$result" @@ -69,8 +69,9 @@ start(){ chmod 0755 "$datadir" # 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 & + # create it at all. Likewise, we specify --log-error in case there + # was not an entry in my.cnf. + /usr/bin/mysqld_safe --defaults-file=/etc/my.cnf --pid-file="$mypidfile" --log-error="$errlogfile" >/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 0896d82..2fe9670 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.0.18 -Release: 1.1 +Release: 2 Summary: MySQL client programs and shared libraries. License: GPL Group: Applications/Databases @@ -380,6 +380,9 @@ fi %{_datadir}/sql-bench %changelog +* Thu Feb 9 2006 Tom Lane 5.0.18-2 +- err-log option has been renamed to log-error, fix my.cnf and initscript + * Tue Feb 07 2006 Jesse Keating - 5.0.18-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes