From 5461520dedd124076f6e9372149de0fc8dcacda4 Mon Sep 17 00:00:00 2001
From: jian he <jian.universality@gmail.com>
Date: Tue, 24 Feb 2026 15:19:41 +0800
Subject: [PATCH v19 1/1] misc change for v19

---
 doc/src/sgml/ref/pg_restore.sgml | 10 ++++++++++
 src/bin/pg_dump/pg_dumpall.c     |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index ff50fc23539..47ad26630eb 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -69,6 +69,16 @@ PostgreSQL documentation
    <application>pg_dump</application> options.
   </para>
 
+   <para>
+    Restoring from an archive created by <application>pg_dumpall</application> does not support the following options:
+    <option>-a/--data-only</option>,
+    <option>-l/--list</option>,
+    <option>-L/--use-list</option>,
+    <option>--statistics-only</option>,
+    <option>--strict-names</option>,
+    <option>--no-schema</option>.
+   </para>
+
   <para>
    A non-plain-text archive made using <application>pg_dumpall</application>
    is a directory containing a <filename>toc.glo</filename> file with global
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 92d1214b421..bdbe52cfe3c 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -135,7 +135,6 @@ static SimpleStringList database_exclude_names = {NULL, NULL};
 
 static char *restrict_key;
 static Archive *fout = NULL;
-static pg_compress_specification compression_spec = {0};
 static int	dumpIdVal = 0;
 static ArchiveFormat archDumpFormat = archNull;
 static const CatalogId nilCatalogId = {0, 0};
@@ -656,6 +655,7 @@ main(int argc, char *argv[])
 		PQExpBuffer qry = createPQExpBuffer();
 		char		global_path[MAXPGPATH];
 		const char *encname;
+		pg_compress_specification compression_spec = {0};
 
 		/*
 		 * Check that no global object names contain newlines or carriage
@@ -1194,7 +1194,9 @@ dumpRoles(PGconn *conn)
 		if (archDumpFormat == archNull)
 		{
 			fprintf(OPF, "%s", buf->data);
-			fprintf(OPF, "%s", comment_buf->data);
+
+			if (comment_buf->data[0] != '\0')
+				fprintf(OPF, "%s", comment_buf->data);
 
 			if (seclabel_buf->data[0] != '\0')
 				fprintf(OPF, "%s", seclabel_buf->data);
-- 
2.34.1