[Pkg-mysql-commits] r1614 - in mysql-dfsg-5.1/branches/experimental/debian: . additions

[Christian Hammers]

Author: ch
Date: 2009-07-04 00:24:12 +0000 (Sat, 04 Jul 2009)
New Revision: 1614

Added:
   mysql-dfsg-5.1/branches/experimental/debian/additions/mysqld_safe_syslog.cnf
Modified:
   mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
   mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf
   mysql-dfsg-5.1/branches/experimental/debian/changelog
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.dirs
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.files
   mysql-dfsg-5.1/branches/experimental/debian/rules
Log:
  * Added /etc/mysql/conf.d/mysqld_safe_syslog.cnf which enables mysqld_safe
    to pipe all mysqld output into the syslog. The reason for not letting dpkg
    handle it via a normal config file change was that my.cnf is usually
    heavily tuned by the admin so the setting would go lost too easily.



Modified: mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/README.Maintainer	2009-07-04 00:24:12 UTC (rev 1614)
@@ -4,7 +4,6 @@
 ###########################
 
 # http://dev.mysql.com/doc/refman/5.1/en/upgrading-from-5-0.html
-* Append --syslog to /etc/mysql/*
 * call the REPAIR TABLE statement for each table that contains any FULLTEXT  indexes.
 * put this trigger-recreation thing into the init scripts -- what?!
 * Let debian-i10n-english review all template changes before the translaters start.

Modified: mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/additions/my.cnf	2009-07-04 00:24:12 UTC (rev 1614)
@@ -72,9 +72,11 @@
 #
 # Both location gets rotated by the cronjob.
 # Be aware that this log type is a performance killer.
-#log		= /var/log/mysql/mysql.log
+# As of 5.1 you can enable the  at runtime!
+#log_type           = FILE
+#general_log		= /var/log/mysql/mysql.log
 #
-# Error logging goes to syslog. This is a Debian improvement :)
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
 #
 # Here you can see queries with especially long duration
 #log_slow_queries	= /var/log/mysql/mysql-slow.log

Added: mysql-dfsg-5.1/branches/experimental/debian/additions/mysqld_safe_syslog.cnf
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/additions/mysqld_safe_syslog.cnf	                        (rev 0)
+++ mysql-dfsg-5.1/branches/experimental/debian/additions/mysqld_safe_syslog.cnf	2009-07-04 00:24:12 UTC (rev 1614)
@@ -0,0 +1,2 @@
+[mysqld_safe]
+syslog

Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-04 00:24:12 UTC (rev 1614)
@@ -12,6 +12,10 @@
     (thanks to Mathias Gug). Closes: #535500
   * Removed the check for ISAM tables as the only supported upgrade path is
     from lenny's MySQL-5.0.
+  * Added /etc/mysql/conf.d/mysqld_safe_syslog.cnf which enables mysqld_safe
+    to pipe all mysqld output into the syslog. The reason for not letting dpkg
+    handle it via a normal config file change was that my.cnf is usually
+    heavily tuned by the admin so the setting would go lost too easily.
 
  -- Christian Hammers <ch at debian.org>  Wed, 01 Jul 2009 20:54:58 +0200
 

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.dirs
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.dirs	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.dirs	2009-07-04 00:24:12 UTC (rev 1614)
@@ -1,5 +1,6 @@
 etc/init.d
 etc/logrotate.d
+etc/mysql/conf.d
 usr/bin
 usr/sbin
 usr/share/man/man8

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.files
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.files	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.files	2009-07-04 00:24:12 UTC (rev 1614)
@@ -1,5 +1,6 @@
 usr/lib/mysql/*so*
 etc/mysql/debian-start
+etc/mysql/conf.d/mysqld_safe_syslog.cnf
 usr/bin/msql2mysql
 usr/bin/my_print_defaults
 usr/bin/myisamchk

Modified: mysql-dfsg-5.1/branches/experimental/debian/rules
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/rules	2009-07-03 23:46:48 UTC (rev 1613)
+++ mysql-dfsg-5.1/branches/experimental/debian/rules	2009-07-04 00:24:12 UTC (rev 1614)
@@ -182,6 +182,8 @@
 	mkdir -p $(TMP)/usr/share/man/man1/
 	mkdir -p $(TMP)/usr/share/man/man8/
 	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
+	mkdir -p $(TMP)/etc/mysql/conf.d/
+	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanager-pwgen.1
 	ln -s mysqlmanager.1 $(TMP)/usr/share/man/man1/mysqlmanagerc.1