[Pkg-mysql-commits] r2084 - in mysql-5.5/branches/experimental/debian: . additions
Nicholas Bamber
periapt at alioth.debian.org
Sat May 5 12:32:23 UTC 2012
Author: periapt
Date: 2012-05-05 12:32:23 +0000 (Sat, 05 May 2012)
New Revision: 2084
Added:
mysql-5.5/branches/experimental/debian/libmysqld-pic.install
Removed:
mysql-5.5/branches/experimental/debian/libmysqld-pic.files
Modified:
mysql-5.5/branches/experimental/debian/additions/my.cnf
mysql-5.5/branches/experimental/debian/changelog
mysql-5.5/branches/experimental/debian/control
mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.paranoid
mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.server
mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.workstation
mysql-5.5/branches/experimental/debian/mysql-server-5.5.mysql.init
mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst
mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
mysql-5.5/branches/experimental/debian/rules
Log:
* Migrated libmysqld-dev, libmysqld-pic to using dh_install rather
than dh_movefiles
* Changed /var/run to /run as required by Debian Policy 3.9.3 (9.1.1)
* Raised standards version to 3.9.3
Modified: mysql-5.5/branches/experimental/debian/additions/my.cnf
===================================================================
--- mysql-5.5/branches/experimental/debian/additions/my.cnf 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/additions/my.cnf 2012-05-05 12:32:23 UTC (rev 2084)
@@ -18,14 +18,14 @@
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
[client]
port = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = /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 = /var/run/mysqld/mysqld.sock
+socket = /run/mysqld/mysqld.sock
nice = 0
[mysqld]
@@ -33,8 +33,8 @@
# * Basic Settings
#
user = mysql
-pid-file = /var/run/mysqld/mysqld.pid
-socket = /var/run/mysqld/mysqld.sock
+pid-file = /run/mysqld/mysqld.pid
+socket = /run/mysqld/mysqld.sock
port = 3306
basedir = /usr
datadir = /var/lib/mysql
Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/changelog 2012-05-05 12:32:23 UTC (rev 2084)
@@ -4,7 +4,10 @@
* Stopped testing for /proc filesystem. It is no longer used
for determining the number of CPUs. The procps package itself
is probably still required as per #96768
- * Migrated libmysqld-dev to using dh_install rather than dh_movefiles
+ * Migrated libmysqld-dev, libmysqld-pic to using dh_install rather
+ than dh_movefiles
+ * Changed /var/run to /run as required by Debian Policy 3.9.3 (9.1.1)
+ * Raised standards version to 3.9.3
-- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 04 May 2012 07:26:25 +0100
Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/control 2012-05-05 12:32:23 UTC (rev 2084)
@@ -5,7 +5,7 @@
Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
Build-Depends: libtool (>= 1.4.2-7), procps[!hurd-i386], debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://dev.mysql.com/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
Vcs-Svn: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/
Deleted: mysql-5.5/branches/experimental/debian/libmysqld-pic.files
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqld-pic.files 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/libmysqld-pic.files 2012-05-05 12:32:23 UTC (rev 2084)
@@ -1,2 +0,0 @@
-usr/lib/mysql/libmysqld_pic.a
-usr/bin/mysql_config_pic
Added: mysql-5.5/branches/experimental/debian/libmysqld-pic.install
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqld-pic.install (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqld-pic.install 2012-05-05 12:32:23 UTC (rev 2084)
@@ -0,0 +1,2 @@
+usr/lib/mysql/libmysqld_pic.a
+usr/bin/mysql_config_pic
Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.paranoid
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.paranoid 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.paranoid 2012-05-05 12:32:23 UTC (rev 2084)
@@ -1,8 +1,8 @@
-/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]+\]: Check that mysqld is running and that the socket: '/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: '/var/run/mysqld/mysqld.sock' port: 3306$
+mysqld\[[0-9]+\]: Version: .* socket: '/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/experimental/debian/mysql-server-5.5.logcheck.ignore.server
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.server 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.server 2012-05-05 12:32:23 UTC (rev 2084)
@@ -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: '/var/run/mysqld/mysqld.sock' exists\!$
+/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]+\]: '/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/experimental/debian/mysql-server-5.5.logcheck.ignore.workstation
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.workstation 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.logcheck.ignore.workstation 2012-05-05 12:32:23 UTC (rev 2084)
@@ -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: '/var/run/mysqld/mysqld.sock' exists\!$
+/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]+\]: '/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/experimental/debian/mysql-server-5.5.mysql.init
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.mysql.init 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.mysql.init 2012-05-05 12:32:23 UTC (rev 2084)
@@ -103,7 +103,7 @@
log_end_msg 0
else
# Could be removed during boot
- test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
+ test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
# Start MySQL!
/usr/bin/mysqld_safe > /dev/null 2>&1 &
Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.postinst 2012-05-05 12:32:23 UTC (rev 2084)
@@ -54,17 +54,17 @@
return $retval
}
-# This is necessary because mysql_install_db removes the pid file in /var/run
+# This is necessary because mysql_install_db removes the pid file in /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 /var/run.
+# script fails. I can't tell at this point because of the cleaned /run.
set +e; invoke stop; set -e
case "$1" in
configure)
mysql_datadir=/usr/share/mysql
mysql_statedir=/var/lib/mysql
- mysql_rundir=/var/run/mysqld
+ mysql_rundir=/run/mysqld
mysql_logdir=/var/log
mysql_cfgdir=/etc/mysql
mysql_newlogdir=/var/log/mysql
Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm 2012-05-05 12:32:23 UTC (rev 2084)
@@ -60,7 +60,7 @@
# else we ran into big trouble on the next install!
rm -f /etc/mysql/debian.cnf
rm -rf /var/lib/mysql
- rm -rf /var/run/mysqld
+ rm -rf /run/mysqld
userdel mysql || true
fi
Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules 2012-05-04 17:48:31 UTC (rev 2083)
+++ mysql-5.5/branches/experimental/debian/rules 2012-05-05 12:32:23 UTC (rev 2084)
@@ -92,7 +92,7 @@
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
$(FORCE_FPIC) \
- -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-DMYSQL_USER=mysql \
-DWITH_LIBWRAP=ON \
-DWITH_READLINE=OFF \
More information about the Pkg-mysql-commits
mailing list