diff --git a/doc/src/sgml/func/func-info.sgml b/doc/src/sgml/func/func-info.sgml
index 8ffa7e83275..34f4019690f 100644
--- a/doc/src/sgml/func/func-info.sgml
+++ b/doc/src/sgml/func/func-info.sgml
@@ -3882,7 +3882,7 @@ acl      | {postgres=arwdDxtm/postgres,foo=r/postgres}
         <function>pg_get_role_ddl</function>
         ( <parameter>role</parameter> <type>regrole</type>
         <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
-        <type>text</type> </optional> )
+        <type>text[]</type> </optional> )
         <returnvalue>setof text</returnvalue>
        </para>
        <para>
@@ -3904,14 +3904,14 @@ acl      | {postgres=arwdDxtm/postgres,foo=r/postgres}
         <function>pg_get_tablespace_ddl</function>
         ( <parameter>tablespace</parameter> <type>oid</type>
         <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
-        <type>text</type> </optional> )
+        <type>text[]</type> </optional> )
         <returnvalue>setof text</returnvalue>
        </para>
        <para role="func_signature">
         <function>pg_get_tablespace_ddl</function>
         ( <parameter>tablespace</parameter> <type>name</type>
         <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
-        <type>text</type> </optional> )
+        <type>text[]</type> </optional> )
         <returnvalue>setof text</returnvalue>
        </para>
        <para>
@@ -3932,7 +3932,7 @@ acl      | {postgres=arwdDxtm/postgres,foo=r/postgres}
         <function>pg_get_database_ddl</function>
         ( <parameter>database</parameter> <type>regdatabase</type>
         <optional>, <literal>VARIADIC</literal> <parameter>options</parameter>
-        <type>text</type> </optional> )
+        <type>text[]</type> </optional> )
         <returnvalue>setof text</returnvalue>
        </para>
        <para>
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index c4e94a3a09e..fba78c20733 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202606091
+#define CATALOG_VERSION_NO	202606231
 
 #endif
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index be157a5fbe9..fa76c7923f0 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -8593,26 +8593,26 @@
 { oid => '6501', descr => 'get DDL to recreate a role',
   proname => 'pg_get_role_ddl', prorows => '10', provariadic => 'text',
   proisstrict => 'f', proretset => 't', provolatile => 's',
-  pronargdefaults => '1', prorettype => 'text', proargtypes => 'regrole text',
-  proallargtypes => '{regrole,text}', proargmodes => '{i,v}',
+  pronargdefaults => '1', prorettype => 'text', proargtypes => 'regrole _text',
+  proallargtypes => '{regrole,_text}', proargmodes => '{i,v}',
   proargdefaults => '{NULL}', prosrc => 'pg_get_role_ddl' },
 { oid => '6499', descr => 'get DDL to recreate a tablespace',
   proname => 'pg_get_tablespace_ddl', prorows => '10', provariadic => 'text',
   proisstrict => 'f', proretset => 't', provolatile => 's',
-  pronargdefaults => '1', prorettype => 'text', proargtypes => 'oid text',
-  proallargtypes => '{oid,text}', proargmodes => '{i,v}',
+  pronargdefaults => '1', prorettype => 'text', proargtypes => 'oid _text',
+  proallargtypes => '{oid,_text}', proargmodes => '{i,v}',
   proargdefaults => '{NULL}', prosrc => 'pg_get_tablespace_ddl_oid' },
 { oid => '6500', descr => 'get DDL to recreate a tablespace',
   proname => 'pg_get_tablespace_ddl', prorows => '10', provariadic => 'text',
   proisstrict => 'f', proretset => 't', provolatile => 's',
-  pronargdefaults => '1', prorettype => 'text', proargtypes => 'name text',
-  proallargtypes => '{name,text}', proargmodes => '{i,v}',
+  pronargdefaults => '1', prorettype => 'text', proargtypes => 'name _text',
+  proallargtypes => '{name,_text}', proargmodes => '{i,v}',
   proargdefaults => '{NULL}', prosrc => 'pg_get_tablespace_ddl_name' },
 { oid => '6502', descr => 'get DDL to recreate a database',
   proname => 'pg_get_database_ddl', prorows => '10', provariadic => 'text',
   proisstrict => 'f', proretset => 't', provolatile => 's',
   pronargdefaults => '1', prorettype => 'text',
-  proargtypes => 'regdatabase text', proallargtypes => '{regdatabase,text}',
+  proargtypes => 'regdatabase _text', proallargtypes => '{regdatabase,_text}',
   proargmodes => '{i,v}', proargdefaults => '{NULL}',
   prosrc => 'pg_get_database_ddl' },
 { oid => '2509',
diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index cfdc6b1a17a..80400a33734 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -487,7 +487,7 @@ AND case proargtypes[array_length(proargtypes, 1)-1]
 	ELSE (SELECT t.oid
 		  FROM pg_type t
 		  WHERE t.typarray = proargtypes[array_length(proargtypes, 1)-1])
-	END  != provariadic;
+	END IS DISTINCT FROM provariadic;
  oid | provariadic | proargtypes 
 -----+-------------+-------------
 (0 rows)
diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql
index cd674d7dbca..5670bb14193 100644
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -360,7 +360,7 @@ AND case proargtypes[array_length(proargtypes, 1)-1]
 	ELSE (SELECT t.oid
 		  FROM pg_type t
 		  WHERE t.typarray = proargtypes[array_length(proargtypes, 1)-1])
-	END  != provariadic;
+	END IS DISTINCT FROM provariadic;
 
 -- Check that all and only those functions with a variadic type have
 -- a variadic argument.