Fixes for innodb plugins

Tested using mysql 5.1 and 5.5