=== Applying patches on top of PostgreSQL commit ID 5941946d0934b9eccb0d5bfebd40b155249a0130 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 19 22:53:27 UTC 2025
On branch cf/5117
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v08-0001-Add-REPACK-command.patch ===
Applying: Add REPACK command.
=== using 'git am' to apply patch ./v08-0002-Move-progress-related-fields-from-PgBackendStatus-to.patch ===
Applying: Move progress related fields from PgBackendStatus to PgBackendProgress.
error: sha1 information is lacking or useless (src/backend/utils/adt/pgstatfuncs.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move progress related fields from PgBackendStatus to PgBackendProgress.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
=== using patch(1) to apply patch ./v08-0002-Move-progress-related-fields-from-PgBackendStatus-to.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v08-0002-Move-progress-related-fields-from-PgBackendStatus-to.patch ===
Applied patch to 'src/backend/access/heap/vacuumlazy.c' cleanly.
Applied patch to 'src/backend/commands/analyze.c' cleanly.
Applied patch to 'src/backend/utils/activity/backend_progress.c' cleanly.
Applied patch to 'src/backend/utils/activity/backend_status.c' with conflicts.
error: repository lacks the necessary blob to perform 3-way merge.
Falling back to direct application...
Applied patch to 'src/include/utils/backend_progress.h' cleanly.
Applied patch to 'src/include/utils/backend_status.h' cleanly.
U src/backend/utils/activity/backend_status.c
diff --cc src/backend/utils/activity/backend_status.c
index 7681b4ba5a9,647bf863f04..00000000000
--- a/src/backend/utils/activity/backend_status.c
+++ b/src/backend/utils/activity/backend_status.c
@@@ -314,12 -336,48 +314,18 @@@ pgstat_bestart_initial(void
  	else
  		MemSet(&lbeentry.st_clientaddr, 0, sizeof(lbeentry.st_clientaddr));
  
 -#ifdef USE_SSL
 -	if (MyProcPort && MyProcPort->ssl_in_use)
 -	{
 -		lbeentry.st_ssl = true;
 -		lsslstatus.ssl_bits = be_tls_get_cipher_bits(MyProcPort);
 -		strlcpy(lsslstatus.ssl_version, be_tls_get_version(MyProcPort), NAMEDATALEN);
 -		strlcpy(lsslstatus.ssl_cipher, be_tls_get_cipher(MyProcPort), NAMEDATALEN);
 -		be_tls_get_peer_subject_name(MyProcPort, lsslstatus.ssl_client_dn, NAMEDATALEN);
 -		be_tls_get_peer_serial(MyProcPort, lsslstatus.ssl_client_serial, NAMEDATALEN);
 -		be_tls_get_peer_issuer_name(MyProcPort, lsslstatus.ssl_issuer_dn, NAMEDATALEN);
 -	}
 -	else
 -	{
 -		lbeentry.st_ssl = false;
 -	}
 -#else
  	lbeentry.st_ssl = false;
 -#endif
 -
 -#ifdef ENABLE_GSS
 -	if (MyProcPort && MyProcPort->gss != NULL)
 -	{
 -		const char *princ = be_gssapi_get_princ(MyProcPort);
 -
 -		lbeentry.st_gss = true;
 -		lgssstatus.gss_auth = be_gssapi_get_auth(MyProcPort);
 -		lgssstatus.gss_enc = be_gssapi_get_enc(MyProcPort);
 -		lgssstatus.gss_delegation = be_gssapi_get_delegation(MyProcPort);
 -		if (princ)
 -			strlcpy(lgssstatus.gss_princ, princ, NAMEDATALEN);
 -	}
 -	else
 -	{
 -		lbeentry.st_gss = false;
 -	}
 -#else
  	lbeentry.st_gss = false;
 -#endif
  
++<<<<<<< ours
 +	lbeentry.st_state = STATE_STARTING;
 +	lbeentry.st_progress_command = PROGRESS_COMMAND_INVALID;
 +	lbeentry.st_progress_command_target = InvalidOid;
++=======
+ 	lbeentry.st_state = STATE_UNDEFINED;
+ 	lbeentry.st_progress.command = PROGRESS_COMMAND_INVALID;
+ 	lbeentry.st_progress.command_target = InvalidOid;
++>>>>>>> theirs
  	lbeentry.st_query_id = UINT64CONST(0);
  
  	/*