Merge "Fix guarding of MySQL's numRows()"