更正了升级脚本

src/common/backend/utils/init/globals.cpp

@@ -59,7 +59,7 @@ bool open_join_children = true;
 bool will_shutdown = false;
 
 /* hard-wired binary version number */
-const uint32 GRAND_VERSION_NUM = 92421;
+const uint32 GRAND_VERSION_NUM = 92422;
 
 const uint32 HINT_ENHANCEMENT_VERSION_NUM = 92359;
 const uint32 MATVIEW_VERSION_NUM = 92213;

src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_422.sql

@@ -0,0 +1,5 @@
+-- --------------------------------------------------------------
+-- rollback pg_catalog.pg_collation
+-- --------------------------------------------------------------
+delete from pg_catalog.pg_collation where collname='zh_CN' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';
+delete from pg_catalog.pg_collation where collname='zh_CN.gb18030' and collnamespace=11 and collencoding=36 and collcollate='zh_CN.gb18030' and collctype='zh_CN.gb18030';

src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_200.sql

@@ -2358,22 +2358,4 @@ out pg_control_version pg_catalog.int4,
 out catalog_version_no pg_catalog.int4,
 out system_identifier pg_catalog.int8,
 out pg_control_last_modified pg_catalog.timestamptz)
-RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'pg_control_system';
-
-DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
-CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
-(out bufferid pg_catalog.int4,
-out relfilenode pg_catalog.oid,
-out bucketid pg_catalog.int2,
-out storage_type pg_catalog.int2,
-out reltablespace pg_catalog.oid,
-out reldatabase pg_catalog.oid,
-out relforknumber pg_catalog.int2,
-out relblocknumber pg_catalog.int8,
-out isdirty pg_catalog.bool,
-out isvalid pg_catalog.bool,
-out usage_count pg_catalog.int2,
-out pinning_backends pg_catalog.int4)
-RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';
+RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'pg_control_system';

src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_422.sql

@@ -0,0 +1,20 @@
+-- --------------------------------------------------------------
+-- upgrade pg_catalog.pg_buffercache_pages
+-- --------------------------------------------------------------
+DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
+CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
+(out bufferid pg_catalog.int4,
+out relfilenode pg_catalog.oid,
+out bucketid pg_catalog.int2,
+out storage_type pg_catalog.int2,
+out reltablespace pg_catalog.oid,
+out reldatabase pg_catalog.oid,
+out relforknumber pg_catalog.int2,
+out relblocknumber pg_catalog.int8,
+out isdirty pg_catalog.bool,
+out isvalid pg_catalog.bool,
+out usage_count pg_catalog.int2,
+out pinning_backends pg_catalog.int4)
+RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';

src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_200.sql

@@ -2392,22 +2392,4 @@ out pg_control_version pg_catalog.int4,
 out catalog_version_no pg_catalog.int4,
 out system_identifier pg_catalog.int8,
 out pg_control_last_modified pg_catalog.timestamptz)
-RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'pg_control_system';
-
-DROP FUNCTION IF EXISTS pg_catalog.pg_buffercache_pages() CASCADE;
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 4130;
-CREATE OR REPLACE FUNCTION pg_catalog.pg_buffercache_pages
-(out bufferid pg_catalog.int4,
-out relfilenode pg_catalog.oid,
-out bucketid pg_catalog.int2,
-out storage_type pg_catalog.int2,
-out reltablespace pg_catalog.oid,
-out reldatabase pg_catalog.oid,
-out relforknumber pg_catalog.int2,
-out relblocknumber pg_catalog.int8,
-out isdirty pg_catalog.bool,
-out isvalid pg_catalog.bool,
-out usage_count pg_catalog.int2,
-out pinning_backends pg_catalog.int4)
-RETURNS SETOF record LANGUAGE INTERNAL STABLE STRICT as 'pg_buffercache_pages';
+RETURNS SETOF record LANGUAGE INTERNAL VOLATILE STRICT as 'pg_control_system';