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,15 +30,10 @@
     for i in `seq 1 30` ; do
-		/usr/bin/mysqladmin --defaults-file=$HOME/debian.cnf ping
-		ret = $?
-		if [ $ret -eq 0 ] ; then
-			break
-		fi
-		sleep 1
+        /usr/bin/mysqladmin --defaults-file="${HOME}"/debian.cnf ping && {
+            exec "${HOME}"/debian-start
+            # should not reach this line
+            exit 2
+        }
+        sleep 1
     done
-	if [ $ret -eq 0 ] ; then
-    	exec $HOME/debian-start
-	else
-		echo "timeout."
-	fi
-
+    exit 1
 end script
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.4+upstartfix2) lucid; urgency=low
+
+  * debian/mysql-server-5.1.mysql.upstart:
+    - Fix shell script bugs (LP: #608423)
+    - Insert missing space so that mysqld starts at boot again
+    - Don't echo "timeout."
+
+ -- a7x <ubuntu-a7x@scientician.org>  Tue, 27 Jul 2010 21:46:51 -0400
+
 mysql-dfsg-5.1 (5.1.41-3ubuntu12.4) lucid-proposed; urgency=low
 
   * debian/mysql-server-5.1.mysql.upstart: Don't wait forever to mysql to come up.