[Pkg-mysql-commits] r2145 - in mysql-5.5/branches/unstable/debian: . additions
Nicholas Bamber
periapt at alioth.debian.org
Sun Jun 10 15:54:36 UTC 2012
tags 676560 pending
thanks
Author: periapt
Date: 2012-06-10 15:54:35 +0000 (Sun, 10 Jun 2012)
New Revision: 2145
Modified:
mysql-5.5/branches/unstable/debian/additions/my.cnf
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/control
mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.paranoid
mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.server
mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.workstation
mysql-5.5/branches/unstable/debian/mysql-server-5.5.mysql.init
mysql-5.5/branches/unstable/debian/mysql-server-5.5.postinst
mysql-5.5/branches/unstable/debian/mysql-server-5.5.postrm
mysql-5.5/branches/unstable/debian/rules
Log:
Added versioned dependency on initscripts and revert /var/run
to /run change (Closes: #676560)
Modified: mysql-5.5/branches/unstable/debian/additions/my.cnf
===================================================================
--- mysql-5.5/branches/unstable/debian/additions/my.cnf 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/additions/my.cnf 2012-06-10 15:54:35 UTC (rev 2145)
@@ -18,14 +18,14 @@
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
[client]
port = 3306
-socket = /run/mysqld/mysqld.sock
+socket = /var/run/mysqld/mysqld.sock
# Here is entries for some specific programs
# The following values assume you have at least 32M ram
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
[mysqld_safe]
-socket = /run/mysqld/mysqld.sock
+socket = /var/run/mysqld/mysqld.sock
nice = 0
[mysqld]
@@ -33,8 +33,8 @@
# * Basic Settings
#
user = mysql
-pid-file = /run/mysqld/mysqld.pid
-socket = /run/mysqld/mysqld.sock
+pid-file = /var/run/mysqld/mysqld.pid
+socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
datadir = /var/lib/mysql
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-06-10 15:54:35 UTC (rev 2145)
@@ -51,6 +51,8 @@
and bumped dependency in shlibs (Closes: #660686)
* Ensured that /etc/mysql/conf.d is installed as part of mysql-common
so that client programs work without a co-located server (Closes: #672359)
+ * Added versioned dependency on initscripts and revert /var/run
+ to /run change (Closes: #676560)
-- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/control 2012-06-10 15:54:35 UTC (rev 2145)
@@ -113,7 +113,7 @@
Recommends: libhtml-template-perl
Suggests: tinyca, mailx
Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
+Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version}), initscripts (>= 2.88dsf-13.3)
Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
Provides: virtual-mysql-server
Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0,
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.paranoid
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.paranoid 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.paranoid 2012-06-10 15:54:35 UTC (rev 2145)
@@ -1,8 +1,8 @@
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
mysqld\[[0-9]+\]: $
-mysqld\[[0-9]+\]: Version: .* socket: '/run/mysqld/mysqld.sock' port: 3306$
+mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock' port: 3306$
mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
mysqld_safe\[[0-9]+\]: started$
usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.server
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.server 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.server 2012-06-10 15:54:35 UTC (rev 2145)
@@ -1,5 +1,5 @@
/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
mysqld\[[0-9]+\]: ?$
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.workstation
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.workstation 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.logcheck.ignore.workstation 2012-06-10 15:54:35 UTC (rev 2145)
@@ -1,5 +1,5 @@
/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
mysqld\[[0-9]+\]: ?$
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.mysql.init
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.mysql.init 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.mysql.init 2012-06-10 15:54:35 UTC (rev 2145)
@@ -103,7 +103,7 @@
log_end_msg 0
else
# Could be removed during boot
- test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
+ test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
# Start MySQL!
/usr/bin/mysqld_safe > /dev/null 2>&1 &
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.postinst
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.postinst 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.postinst 2012-06-10 15:54:35 UTC (rev 2145)
@@ -56,17 +56,17 @@
return $retval
}
-# This is necessary because mysql_install_db removes the pid file in /run
+# This is necessary because mysql_install_db removes the pid file in /var/run
# and because changed configuration options should take effect immediately.
# In case the server wasn't running at all it should be ok if the stop
-# script fails. I can't tell at this point because of the cleaned /run.
+# script fails. I can't tell at this point because of the cleaned /var/run.
set +e; invoke stop; set -e
case "$1" in
configure)
mysql_datadir=/usr/share/mysql
mysql_statedir=/var/lib/mysql
- mysql_rundir=/run/mysqld
+ mysql_rundir=/var/run/mysqld
mysql_logdir=/var/log
mysql_cfgdir=/etc/mysql
mysql_newlogdir=/var/log/mysql
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.postrm
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.postrm 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.postrm 2012-06-10 15:54:35 UTC (rev 2145)
@@ -62,7 +62,7 @@
# else we ran into big trouble on the next install!
rm -f /etc/mysql/debian.cnf
rm -rf /var/lib/mysql
- rm -rf /run/mysqld
+ rm -rf /var/run/mysqld
userdel mysql || true
fi
Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-06-09 07:13:24 UTC (rev 2144)
+++ mysql-5.5/branches/unstable/debian/rules 2012-06-10 15:54:35 UTC (rev 2145)
@@ -88,7 +88,7 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
$(FORCE_FPIC) \
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-DMYSQL_USER=mysql \
-DWITH_LIBWRAP=ON \
-DWITH_READLINE=OFF \
More information about the Pkg-mysql-commits
mailing list