rpms/mysql/devel my.cnf, 1.2, 1.3 mysql.init, 1.17, 1.18 mysql.spec, 1.71, 1.72

[fedora-cvs-commits at redhat.com]

Author: tgl

Update of /cvs/dist/rpms/mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8305

Modified Files:
	my.cnf mysql.init mysql.spec 
Log Message:
err-log option has been renamed to log-error, fix my.cnf and initscript


Index: my.cnf
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/my.cnf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- my.cnf	23 Nov 2004 19:03:37 -0000	1.2
+++ my.cnf	9 Feb 2006 21:25:10 -0000	1.3
@@ -10,5 +10,5 @@
 basedir=/var/lib
 
 [mysqld_safe]
-err-log=/var/log/mysqld.log
+log-error=/var/log/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid


Index: mysql.init
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mysql.init	14 Nov 2005 17:31:18 -0000	1.17
+++ mysql.init	9 Feb 2006 21:25:10 -0000	1.18
@@ -47,7 +47,7 @@
 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 @@
 	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


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mysql.spec	7 Feb 2006 13:07:52 -0000	1.71
+++ mysql.spec	9 Feb 2006 21:25:10 -0000	1.72
@@ -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 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Thu Feb  9 2006 Tom Lane <tgl at redhat.com> 5.0.18-2
+- err-log option has been renamed to log-error, fix my.cnf and initscript
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0.18-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes