[Pkg-mysql-commits] r1343 - branches/experimental-5.0/debian

[Norbert Tretkowski]

tags 314785 pending
tags 324834 pending
tags 435165 pending
tags 444216 pending
thanks

Author: nobse
Date: 2008-11-10 12:56:56 +0000 (Mon, 10 Nov 2008)
New Revision: 1343

Modified:
   branches/experimental-5.0/debian/changelog
   branches/experimental-5.0/debian/mysql-server-5.0.mysql.init
Log:
Add patch from Dan Munckton.

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2008-11-02 17:11:11 UTC (rev 1342)
+++ branches/experimental-5.0/debian/changelog	2008-11-10 12:56:56 UTC (rev 1343)
@@ -1,3 +1,14 @@
+mysql-dfsg-5.0 (5.0.67-2) UNRELEASED; urgency=low
+
+  * Add patch from Dan Munckton:
+    + Clearly indicate that we do not support running multiple instances
+      of mysqld by duplicating the init script.
+      (closes: #314785, #324834, #435165, #444216)
+    + Properly parameterize all existing references to the mysql config
+      file (/etc/mysql/my.cnf).
+
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 10 Nov 2008 13:47:34 +0100
+
 mysql-dfsg-5.0 (5.0.67-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/experimental-5.0/debian/mysql-server-5.0.mysql.init
===================================================================
--- branches/experimental-5.0/debian/mysql-server-5.0.mysql.init	2008-11-02 17:11:11 UTC (rev 1342)
+++ branches/experimental-5.0/debian/mysql-server-5.0.mysql.init	2008-11-10 12:56:56 UTC (rev 1343)
@@ -21,8 +21,11 @@
 
 . /lib/lsb/init-functions
 
+# NOTE: Copying this script and changing the CONF variable here isn't
+# enough to run multiple instances of mysqld. Debian/Ubuntu doesn't 
+# currently support such a configuration out of the box.
+CONF=/etc/mysql/my.cnf
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-CONF=/etc/mysql/my.cnf
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 
 # priority can be overriden and "-s" adds output to stderr
@@ -51,9 +54,9 @@
 ## Do some sanity checks before even trying to start mysqld.
 sanity_checks() {
   # check for config file
-  if [ ! -r /etc/mysql/my.cnf ]; then
-    log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
-    echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
+  if [ ! -r "$CONF" ]; then
+    log_warning_msg "$0: WARNING: $CONF cannot be read. See README.Debian.gz"
+    echo                "WARNING: $CONF cannot be read. See README.Debian.gz" | $ERR_LOGGER
   fi
 
   # check for diskspace shortage