diff -u mysql-dfsg-5.1-5.1.41/debian/changelog mysql-dfsg-5.1-5.1.41/debian/changelog --- mysql-dfsg-5.1-5.1.41/debian/changelog +++ mysql-dfsg-5.1-5.1.41/debian/changelog @@ -1,3 +1,12 @@ +mysql-dfsg-5.1 (5.1.41-3ubuntu12.5+upstartfix0) lucid; urgency=low + + * debian/mysql-server-5.1.mysql.upstart: + - Insert missing space so that mysqld starts at boot again + - Sleep between pings to mysqld + - Immediately return failure if 'exec' fails + + -- a7x Wed, 28 Jul 2010 11:37:25 -0400 + mysql-dfsg-5.1 (5.1.41-3ubuntu12.5) lucid-proposed; urgency=low * debian/mysql-server-5.1.mysql.upstart: Fix typo. (LP: #608423) diff -u mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart --- mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart +++ mysql-dfsg-5.1-5.1.41/debian/mysql-server-5.1.mysql.upstart @@ -5,7 +5,7 @@ start on (net-device-up and local-filesystems - and runlevel[2345]) + and runlevel [2345]) stop on runlevel [016] respawn @@ -30,4 +30,10 @@ for i in `seq 1 30` ; do - /usr/bin/mysqladmin --defaults-file=$HOME/debian.cnf ping && exec $HOME/debian-start + /usr/bin/mysqladmin --defaults-file="${HOME}"/debian.cnf ping && { + exec "${HOME}"/debian-start + # should not reach this line + exit 2 + } + sleep 1 done + exit 1 end script