Altered mysql config passing, fixed some test issues

Altered mysql config passing, fixed some test issues

Switched mysql config file use to be an extra file, so that existing
system config files can be considered instead of being ignored.

Does mean that user config files could take precedance, but hopefully
that should not be a big concern.