(cherry picked from commit 1704eacf24)
1704eacf24
finally, test_resultset and test_insert_exec. Update all idioms within these. (cherry picked from commit a8e1d33ae5)
a8e1d33ae5