From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Thu, 9 Mar 2017 23:38:38 +0000 (+0100)
Subject: Merge branch 'master' into postgres-stmt-name-collision
X-Git-Tag: rec-4.1.0-alpha1~218^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ec7afcc99b6bf5853cd7cdd27745890151c962f;p=thirdparty%2Fpdns.git

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

3ec7afcc99b6bf5853cd7cdd27745890151c962f
diff --cc modules/gpgsqlbackend/spgsql.cc
index 0083a72c7f,2b40040395..22eaf0e048
--- a/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")); }