--- /etc/mysql/my.cnf	2011-10-29 17:59:10.000000000 +0100
+++ /etc/mysql/my.cnf.dpkg-new	2012-03-30 02:42:29.000000000 +0100
@@ -32,26 +32,19 @@
 #
 # * Basic Settings
 #
-
-#
-# * IMPORTANT
-#   If you make changes to these settings and your system uses apparmor, you may
-#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
 user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
 port		= 3306
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
 skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
-# damian, this line seems to be problematic
-# damian 2011, was recommended to comment out the line below after ubuntu upgrade problems.
-#bind-address		= 127.0.0.1
+bind-address		= 127.0.0.1
 #
 # * Fine Tuning
 #
@@ -78,9 +71,9 @@
 # As of 5.1 you can enable the log at runtime!
 #general_log_file        = /var/log/mysql/mysql.log
 #general_log             = 1
-
-log_error                = /var/log/mysql/error.log
-
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
 # Here you can see queries with especially long duration
 #log_slow_queries	= /var/log/mysql/mysql-slow.log
 #long_query_time = 2