2.2 Database Error (Blogroll and Categories)

I just upgraded to 2.2 and neither my blogroll nor my categories (when I am writing) will display properly. I followed the upgrade instructions to the letter, and I am having no other problems. The error code I am getting is below. Can anyone provide any advice?

This is what I get:

WordPress database error:

[Unknown column ‘link_count’ in ‘where clause’]
SELECT cat_ID FROM wp_categories WHERE category_parent = 0 AND ( link_count = 0 OR category_count != 0 OR ( link_count = 0 AND category_count = 0 ) ) ORDER BY category_count DESC