[gnunet] branch master updated (3ddc92934 -> b6bdddad9)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from 3ddc92934 TNG(quic): Review pass and FIXME organization
     new 95f401fb3 -match prototype
     new b6bdddad9 -fix issue with multiple dbinit running concurrently

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/pq/pq_query_helper.c | 2 +-
 src/pq/versioning.sql    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 66858dd88..0350ad336 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -1129,7 +1129,7 @@ GNUNET_PQ_query_param_array_bytes_same_size (
 struct GNUNET_PQ_QueryParam
 GNUNET_PQ_query_param_array_ptrs_bytes_same_size (
   unsigned int num,
-  const void *elements[],
+  const void *elements[static num],
   size_t same_size,
   struct GNUNET_PQ_Context *db)
 {
diff --git a/src/pq/versioning.sql b/src/pq/versioning.sql
index 116f409b7..c7fa81213 100644
--- a/src/pq/versioning.sql
+++ b/src/pq/versioning.sql
@@ -146,12 +146,17 @@
 
 BEGIN;
 
+-- Added by Christian Grothoff to support concurrency, see
+-- 
https://stackoverflow.com/questions/29900845/create-schema-if-not-exists-raises-duplicate-key-error?rq=4
+LOCK TABLE pg_catalog.pg_namespace;
+
+
 -- This file adds versioning support to database it will be loaded to.
 -- It requires that PL/pgSQL is already loaded - will raise exception 
otherwise.
 -- All versioning "stuff" (tables, functions) is in "_v" schema.
 
 -- All functions are defined as 'RETURNS SETOF INT4' to be able to make them 
to RETURN literally nothing (0 rows).
--- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql 
when calling.
+-- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql 
when calling
 CREATE SCHEMA IF NOT EXISTS _v;
 COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.