Attached is a patch that attempts to work around the issue, but also
breaks some other tests (testFilteringSpecialChars for 'memorydb' and
'anydbm'). I think these broken tests are more of reflection of
short-comings with these backends exposed by the extra testing
performed, rather than the changes to the actual code.

In any case I'm am not certain there is a whole lot of value in pushing
these changes given the rather specific mysql setting that needs to be
configured to trigger it.

In any case I'll leave this patch here in case someone requires it for
their environment.