[Pkg-mysql-commits] r986 - branches/sid-5.0/debian

[Norbert Tretkowski]

Author: nobse
Date: 2007-11-10 14:51:21 +0000 (Sat, 10 Nov 2007)
New Revision: 986

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/mysql-server-5.0.mysql.init
Log:
Remove check for buggy options from init script.

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-11-10 10:36:57 UTC (rev 985)
+++ branches/sid-5.0/debian/changelog	2007-11-10 14:51:21 UTC (rev 986)
@@ -20,11 +20,12 @@
   * Remove informations about a crash in the server during flush-logs when
     having expire_logs_days enabled but log-bin not, this bug was fixed in
     5.0.32 already. (closes: #368547)
+  * Remove check for buggy options from init script.
   * Update innotop to 1.6.0 release.
   * Added mysqlreport and innotop to mysql-client description.
   * Disabled log_bin option in default config file.
 
- -- Norbert Tretkowski <nobse at debian.org>  Sat, 10 Nov 2007 11:32:54 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 10 Nov 2007 15:50:27 +0100
 
 mysql-dfsg-5.0 (5.0.45-1) unstable; urgency=low
 

Modified: branches/sid-5.0/debian/mysql-server-5.0.mysql.init
===================================================================
--- branches/sid-5.0/debian/mysql-server-5.0.mysql.init	2007-11-10 10:36:57 UTC (rev 985)
+++ branches/sid-5.0/debian/mysql-server-5.0.mysql.init	2007-11-10 14:51:21 UTC (rev 986)
@@ -56,13 +56,6 @@
     echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
   fi
 
-  # check for buggy options
-  if grep -q ^expire.logs.days $CONF  &&  ! grep -q ^log.bin $CONF; then
-    log_failure_msg "$0: ERROR: Using expire_logs_days without log_bin crashes the server. See README.Debian.gz"
-    echo                "ERROR: Using expire_logs_days without log_bin crashes the server. See README.Debian.gz" | $ERR_LOGGER
-    exit 1
-  fi
-
   # check for diskspace shortage
   datadir=`mysqld_get_param datadir`
   if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then