Merge branch 'master' into postgres-stmt-name-collision

diff --cc modules/gpgsqlbackend/spgsql.cc
index 0083a72c7f01f566ad338526729c55408113be1f,2b400403957cbb6734ceca5509ba409485c6e1ed..22eaf0e0483f6def4924d88a9e41a163928fdf60
--- 1/modules/gpgsqlbackend/spgsql.cc
--- 2/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@@ -47,7 -46,11 +46,12 @@@ public
      paramValues = NULL;
      paramLengths = NULL;
      d_do_commit = false;
 +    d_nstatement = nstatement;
+     d_paridx = 0;
+     d_residx = 0;
+     d_resnum = 0;
+     d_fnum = 0;
+     d_cur_set = 0;
    }
  
    SSqlStatement* bind(const string& name, bool value) { return bind(name, string(value ? "t" : "f")); }

diff --cc modules/gpgsqlbackend/spgsql.hh
Simple merge