Incorporate suggested fix:  http://bugs.mysql.com/bug.php?id=60134