This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 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 4cc8baa3b5d Fix conflict for main
4cc8baa3b5d is described below
commit 4cc8baa3b5d17fe07117bc8f702c2501fa696859
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Jul 18 15:29:24 2025 +0800
Fix conflict for main
---
src/backend/main/main.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 2a60e8a9031..ff1120d34e5 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -252,16 +252,10 @@ main(int argc, char *argv[])
else if (argc > 1 && strcmp(argv[1], "--describe-config") == 0)
GucInfoMain();
else if (argc > 1 && strcmp(argv[1], "--single") == 0)
-<<<<<<< HEAD
- PostgresMain(argc, argv,
- NULL, /* no dbname */
-
strdup(get_user_name_or_exit(progname))); /* does not return */
- else if (argc > 1 && strcmp(argv[1], "--ext-main") == 0)
- CallExtMain(argc, argv, false);
-=======
PostgresSingleUserMain(argc, argv,
strdup(get_user_name_or_exit(progname)));
->>>>>>> REL_16_9
+ else if (argc > 1 && strcmp(argv[1], "--ext-main") == 0)
+ CallExtMain(argc, argv, false);
else
PostmasterMain(argc, argv);
/* the functions above should not return */
@@ -450,11 +444,7 @@ help(const char *progname)
printf(_(" DBNAME database name (mandatory argument in
bootstrapping mode)\n"));
printf(_(" -K LEN enable cluster file encryption with
specified key bit length\n"));
printf(_(" -r FILENAME send stdout and stderr to given
file\n"));
-<<<<<<< HEAD
- printf(_(" -x NUM internal use\n"));
printf(_(" -u DATADIR copy encryption keys from datadir\n"));
-=======
->>>>>>> REL_16_9
printf(_("\nPlease read the documentation for the complete list of
run-time\n"
"configuration settings and how to set them on the
command line or in\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
