different fix. remove old ones, wait for THD to be fully
initialized before continuing with the server startup process.

This reverts commits db2e21bf, 13615c5e, 3f515a09, 70113ee1.