diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_508.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_508.sql
deleted file mode 100644
index 4c33ad65e..000000000
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_508.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_512.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_604.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_512.sql
rename to src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_604.sql
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_508.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_508.sql
deleted file mode 100644
index 4c33ad65e..000000000
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_508.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_512.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_604.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_512.sql
rename to src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_604.sql
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_508.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_508.sql
deleted file mode 100644
index 9a0dbe34d..000000000
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_508.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
-CREATE OR REPLACE FUNCTION pg_catalog.get_client_info()
- RETURNS text
- LANGUAGE internal
- STABLE STRICT NOT FENCED SHIPPABLE
-AS $function$get_client_info$function$;
-comment on function PG_CATALOG.get_client_info() is 'read current client';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_512.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_512.sql
deleted file mode 100644
index b2378f20e..000000000
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_512.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
-CREATE OR REPLACE FUNCTION pg_catalog.get_client_info(OUT sid bigint, OUT client_info text)
- RETURNS SETOF record
- LANGUAGE internal
- STABLE NOT FENCED SHIPPABLE ROWS 100
-AS $function$get_client_info$function$;
-comment on function PG_CATALOG.get_client_info() is 'read current client';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_604.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_604.sql
index 1de4e7ccf..2ad2cbdec 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_604.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_604.sql
@@ -13,3 +13,14 @@ BEGIN
     end if;
 END
 $$;
+
+DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
+CREATE OR REPLACE FUNCTION pg_catalog.get_client_info(OUT sid bigint, OUT client_info text)
+ RETURNS SETOF record
+ LANGUAGE internal
+ STABLE NOT FENCED SHIPPABLE ROWS 100
+AS $function$get_client_info$function$;
+comment on function PG_CATALOG.get_client_info() is 'read current client';
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_508.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_508.sql
deleted file mode 100644
index 9a0dbe34d..000000000
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_508.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
-CREATE OR REPLACE FUNCTION pg_catalog.get_client_info()
- RETURNS text
- LANGUAGE internal
- STABLE STRICT NOT FENCED SHIPPABLE
-AS $function$get_client_info$function$;
-comment on function PG_CATALOG.get_client_info() is 'read current client';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_512.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_512.sql
deleted file mode 100644
index b2378f20e..000000000
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_512.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
-CREATE OR REPLACE FUNCTION pg_catalog.get_client_info(OUT sid bigint, OUT client_info text)
- RETURNS SETOF record
- LANGUAGE internal
- STABLE NOT FENCED SHIPPABLE ROWS 100
-AS $function$get_client_info$function$;
-comment on function PG_CATALOG.get_client_info() is 'read current client';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_604.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_604.sql
index 1de4e7ccf..2ad2cbdec 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_604.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_604.sql
@@ -13,3 +13,14 @@ BEGIN
     end if;
 END
 $$;
+
+DROP FUNCTION IF EXISTS pg_catalog.get_client_info;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 7732;
+CREATE OR REPLACE FUNCTION pg_catalog.get_client_info(OUT sid bigint, OUT client_info text)
+ RETURNS SETOF record
+ LANGUAGE internal
+ STABLE NOT FENCED SHIPPABLE ROWS 100
+AS $function$get_client_info$function$;
+comment on function PG_CATALOG.get_client_info() is 'read current client';
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;