This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new d69cf90799e Make pg_rewind compile
d69cf90799e is described below
commit d69cf90799e899cdf290aa1bb043d879aafb119b
Author: reshke <[email protected]>
AuthorDate: Mon Dec 22 12:50:31 2025 +0000
Make pg_rewind compile
---
src/bin/Makefile | 1 +
src/common/percentrepl.c | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 24b2efccf88..0a45b245f5a 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -44,6 +44,7 @@ SUBDIRS = \
pg_config \
pg_controldata \
pg_ctl \
+ pg_rewind \
psql \
scripts
diff --git a/src/common/percentrepl.c b/src/common/percentrepl.c
index f22dcdf3efc..53b717edda9 100644
--- a/src/common/percentrepl.c
+++ b/src/common/percentrepl.c
@@ -91,6 +91,10 @@ replace_percent_placeholders(const char *instr, const char
*param_name, const ch
}
else if (sp[1] == 'c')
{
+#ifndef FRONTEND
+ /* GPDB_13_MERGE_FIXME: How to set GpIdentity
for frontend?
+ * Discussion:
https://postgr.es/m/[email protected]
+ */
char contentid[12];
/* GPDB: %c: contentId of segment */
@@ -98,19 +102,29 @@ replace_percent_placeholders(const char *instr, const char
*param_name, const ch
sp++;
pg_ltoa(GpIdentity.segindex, contentid);
appendStringInfoString(&result, contentid);
+#else
+ pg_log_error("contend id is not supported in
frontend");
+ exit(1);
+#endif
break;
}
else if (sp[1] == 'R')
{
+#ifdef FRONTEND
+ pg_log_error("ssl_passphrase_command is not
supported in frontend");
+ exit(1);
+#else
char fd_str[20];
if (terminal_fd == -1)
ereport(ERROR,
(errcode(ERRCODE_INTERNAL_ERROR),
errmsg("ssl_passphrase_command referenced %%R, but -R not specified")));
+
sp++;
snprintf(fd_str, sizeof(fd_str), "%d",
terminal_fd);
appendStringInfoString(&result, fd_str);
+#endif
break;
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
