STORAGE ENGINE TO INNODB

In PFS tests that use mysql_upgrade, disable the general log and
the slow query log to avoid spurious occurrences of
"ERROR 1194: Table 'general_log' marked as crashed".