Comment 4 for bug 551130

Here 'tis. my.cnf is a copy of my.cnf.pkg-dist and my.cnf.old is my old one. I should say that it is possible that I was asked about whether to keep the old one or install the new one, and I might have said keep the old one. I just don't recall.

$ diff my.cnf my.cnf.old
29a30,40
> default-collation=latin1_general_ci
>
> #Enter a name for the query log file. Otherwise a default name will be used.
> #log=/var/log/mysql_query.log
>
>
> #Logs will be rotated after expire-log-days days
> expire_logs_days=30
>
>
>
42a54
> pid-file = /var/run/mysqld/mysqld.pid
47a60
> language = /usr/share/mysql/english
58,62c71,72
< thread_stack = 192K
< thread_cache_size = 8
< # This replaces the startup script and checks MyISAM tables if needed
< # the first time they are touched
< myisam-recover = BACKUP
---
> thread_stack = 128K
> thread_cache_size = 8
69c79
< query_cache_limit = 1M
---
> query_cache_limit = 1M
76,81c86,89
< # 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
<
---
> log = /var/log/mysql/mysql.log
> #
> # Error logging goes to syslog. This is a Debian improvement :)
> #
96a105,109
> # * BerkeleyDB
> #
> # Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
> skip-bdb
> #
100a114,115
> # You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
> #skip-innodb
126a142,153
> # * NDB Cluster
> #
> # See /usr/share/doc/mysql-server-*/README.Debian for more information.
> #
> # The following configuration is read by the NDB Data Nodes (ndbd processes)
> # not from the NDB Management Nodes (ndb_mgmd processes).
> #
> # [MYSQL_CLUSTER]
> # ndb-connectstring=127.0.0.1
>
>
> #
128c155
< # The files must end with '.cnf', otherwise they'll be ignored.
---
> # The files must end with '.cnf', otherwise they'll be ignored.
130a158
>