Merge "numRows on MySQL no longer propagates unrelated errors"