Merge commit '1ab327006c8a248a8a70707fe00e3feb270a05ae' into PGPROEE10

Author: vbwagner

contrib/pg_wait_sampling/collector.c

@@ -42,7 +42,7 @@ register_wait_collector(void)
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
 	worker.bgw_restart_time = 0;
 	worker.bgw_notify_pid = 0;
-#if PG_VERSION_NUM >= 100000
+#if PG_VERSION_NUM >= 100000 || defined(WIN32)
 	memcpy(worker.bgw_library_name, "pg_wait_sampling", BGW_MAXLEN);
 	memcpy(worker.bgw_function_name, CppAsString(collector_main), BGW_MAXLEN);
 #else
@@ -310,10 +310,7 @@ collector_main(Datum main_arg)
 
 	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pg_wait_sampling collector");
 	collector_context = AllocSetContextCreate(TopMemoryContext,
-			"pg_wait_sampling context",
-			ALLOCSET_DEFAULT_MINSIZE,
-			ALLOCSET_DEFAULT_INITSIZE,
-			ALLOCSET_DEFAULT_MAXSIZE);
+			"pg_wait_sampling context", ALLOCSET_DEFAULT_SIZES);
 	old_context = MemoryContextSwitchTo(collector_context);
 	alloc_history(&observations, collector_hdr->historySize);
 	MemoryContextSwitchTo(old_context);