Port of a6101dc (mysql::server::monitor fix) to 2.x.
Merge pull request #306 from apenney/fix-monitor

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