Port of a6101dc (mysql::server::monitor fix) to 2.x.