From ccb21056219ad97da2d866fabda4b212f1883603 Mon Sep 17 00:00:00 2001
From: xue_meng_en <1836611252@qq.com>
Date: Wed, 29 Sep 2021 16:32:30 +0800
Subject: [PATCH] =?UTF-8?q?pg=5Fcollation=E7=B3=BB=E7=BB=9F=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/utils/init/globals.cpp                    | 2 +-
 .../rollback_catalog_maindb_92_421.sql                       | 5 +++++
 .../rollback_catalog_otherdb_92_421.sql                      | 5 +++++
 .../upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql | 4 ++++
 .../upgrade_catalog_otherdb_92_421.sql                       | 4 ++++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_421.sql
 create mode 100644 src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_421.sql
 create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql
 create mode 100644 src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_421.sql

diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp
index 177c43230..ea3d4936b 100644
--- a/src/common/backend/utils/init/globals.cpp
+++ b/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 = 92420;
+const uint32 GRAND_VERSION_NUM = 92421;
 
 const uint32 HINT_ENHANCEMENT_VERSION_NUM = 92359;
 const uint32 MATVIEW_VERSION_NUM = 92213;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_421.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_421.sql
new file mode 100644
index 000000000..be46e8a6e
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_421.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';
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_421.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_421.sql
new file mode 100644
index 000000000..be46e8a6e
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_421.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';
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql
new file mode 100644
index 000000000..ee6088557
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_421.sql
@@ -0,0 +1,4 @@
+-- --------------------------------------------------------------
+-- upgrade pg_catalog.pg_collation
+-- --------------------------------------------------------------
+insert into pg_catalog.pg_collation values ('zh_CN', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030'), ('zh_CN.gb18030', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030');
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_421.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_421.sql
new file mode 100644
index 000000000..ee6088557
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_421.sql
@@ -0,0 +1,4 @@
+-- --------------------------------------------------------------
+-- upgrade pg_catalog.pg_collation
+-- --------------------------------------------------------------
+insert into pg_catalog.pg_collation values ('zh_CN', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030'), ('zh_CN.gb18030', 11, 10, 36, 'zh_CN.gb18030', 'zh_CN.gb18030');
\ No newline at end of file