Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to separate stm/row test cases, the .opt were not moved along with it, causing a 60-second test duration because of default lock timeout :-(
Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you were right