Commitb79a816

Marina Polyakova

committed

Merge remote-tracking branch 'origin/PGPRO-8877'

Conflicts:compat.hCaused by:-22212ba (PGPRO-8877) PostgreSQL 17 support.-ed9f977 (master) Drop support for Postgres < 12

2 parents8eaa130 +22212ba commitb79a816Copy full SHA for b79a816

File tree

+12

-8

lines changed

+12

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ pgws_collector_main(Datum main_arg)`
`348`	`348`	`pqsignal(SIGTERM,handle_sigterm);`
`349`	`349`	`pqsignal(SIGUSR1,procsignal_sigusr1_handler);`
`350`	`350`	`BackgroundWorkerUnblockSignals();`
`351`		`-InitPostgresCompat(NULL,InvalidOid,NULL,InvalidOid,false, false,NULL);`
	`351`	`+InitPostgresCompat(NULL,InvalidOid,NULL,InvalidOid,0,NULL);`
`352`	`352`	`SetProcessingMode(NormalProcessing);`
`353`	`353`
`354`	`354`	`/* Make pg_wait_sampling recognisable in pg_stat_activity */`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,22 +28,26 @@ shm_mq_send_compat(shm_mq_handle mqh, Size nbytes, const void data,`
`28`	`28`	`#endif`
`29`	`29`	`}`
`30`	`30`
	`31`	`+#ifPG_VERSION_NUM<170000`
	`32`	`+#defineINIT_PG_LOAD_SESSION_LIBS0x0001`
	`33`	`+#defineINIT_PG_OVERRIDE_ALLOW_CONNS0x0002`
	`34`	`+#endif`
	`35`	`+`
`31`	`36`	`staticinlinevoid`
`32`	`37`	`InitPostgresCompat(constchar*in_dbname,Oiddboid,`
`33`	`38`	`constchar*username,Oiduseroid,`
`34`		`-boolload_session_libraries,`
`35`		`-booloverride_allow_connections,`
	`39`	`+bits32flags,`
`36`	`40`	`char*out_dbname)`
`37`	`41`	`{`
`38`	`42`	`#ifPG_VERSION_NUM >=170000`
`39`		`-InitPostgres(in_dbname,dboid,username,useroid, (load_session_libraries ?INIT_PG_LOAD_SESSION_LIBS :0) \|`
`40`		`- (override_allow_connections ?INIT_PG_OVERRIDE_ALLOW_CONNS :0),out_dbname);`
	`43`	`+InitPostgres(in_dbname,dboid,username,useroid,flags,out_dbname);`
`41`	`44`	`#elifPG_VERSION_NUM >=150000`
`42`		`-InitPostgres(in_dbname,dboid,username,useroid,load_session_libraries,`
`43`		`-override_allow_connections,out_dbname);`
	`45`	`+InitPostgres(in_dbname,dboid,username,useroid,`
	`46`	`+flags&INIT_PG_LOAD_SESSION_LIBS,`
	`47`	`+flags&INIT_PG_OVERRIDE_ALLOW_CONNS,out_dbname);`
`44`	`48`	`#else`
`45`	`49`	`InitPostgres(in_dbname,dboid,username,useroid,out_dbname,`
`46`		`-override_allow_connections);`
	`50`	`+flags&INIT_PG_OVERRIDE_ALLOW_CONNS);`
`47`	`51`	`#endif`
`48`	`52`	`}`
`49`	`53`

Comments

(0)