Adjusted defrag test that fails randomly (timing problem) and fix
result of innodb_sys_index test.
Fix merge error on binlog_remove_pending_rows causing failure
on binlog_innodb_row test.