am ece0206d: Merge "Fix cursor window leak when query execution fails."

* commit 'ece0206d1273a488b3f622878c794db42dc2e301':
  Fix cursor window leak when query execution fails.