Regarding the patch:
it didn't apply smoothly due to line breaks in long lines in the test case. I removed them (locally) and then it worked.
Regarding the test case:
It creates InnoDB tables, but InnoDB is disabled for the test case. Please either enable it or switch tables to MyISAM, it just doesn't make sense to generate warnings about the missing engine.
Otherwise, I've run a bunch of tests, didn't get any regressions. Please push.
Sent for additional testing