Не запускается MySQL после апгрейда

После апгрейда командой yum update перестал запускаться MySQL:

# service mysqld start
MySQL Daemon failed to start.
Starting mysqld: [FAILED]

В логах:

110727 23:09:15 mysqld_safe Starting mysqld daemon with databases from /var/lib/mysql
110727 23:09:15 [Warning] ‘—skip-locking’ is deprecated and will be removed in a future release. Please use ‘—skip-external-locking’ instead.
110727 23:09:15 [Note] Plugin ‘InnoDB’ is disabled.
110727 23:09:15 [Note] Plugin ‘ndbcluster’ is disabled.
/usr/libexec/mysqld: Table ‘mysql.plugin’ doesn’t exist
110727 23:09:15 [ERROR] Can’t open the mysql.plugin table. Please run mysql_upgrade to create it.
110727 23:09:15 [ERROR] /usr/libexec/mysqld: unknown option ‘—skip-bdb’
110727 23:09:15 [ERROR] Aborting

Видно, что проблема с таблицей mysql.plugin

Запуск mysqld:

# su — mysql -c ./mysqld
110727 23:11:51 [Warning] ‘—skip-locking’ is deprecated and will be removed in a future release. Please use ‘—skip-external-locking’ instead.
110727 23:11:51 [Note] Plugin ‘InnoDB’ is disabled.
110727 23:11:51 [Note] Plugin ‘ndbcluster’ is disabled.
./mysqld: Table ‘mysql.plugin’ doesn’t exist
110727 23:11:51 [ERROR] Can’t open the mysql.plugin table. Please run mysql_upgrade to create it.
110727 23:11:51 [ERROR] ./mysqld: unknown option ‘—skip-bdb’
110727 23:11:51 [ERROR] Aborting

110727 23:11:51 [Note] ./mysqld: Shutdown complete

Нет таблицы mysql.plugin

Решение:

# cp /etc/my.cnf /etc/my.cnf_backup
# cp /etc/my.cnf.rpmnew  /etc/my.cnf
# /etc/init.d/mysqld start