Failed mysql upgrade to 5.5 on debian wheezy

Solution 1:

It appears as if there were innoDB-related files (ibdata1, ib_logfile, etc) in my /var/lib/mysql/ directory. Per the suggestions in this mailing list post, I ran rm ib* and re-ran apt-get dist-upgrade. Everything appears to work.