Merge "rdbms: make affectedRows() work more consistently"