Merge "rdbms: add more error logging to DatabaseMysqlBase::masterPosWait"