More fixes to make the second mysqld instance work ok