A (but copied many) typo of char-mapping tables - Mailing list pgsql-hackers

While I looked into a .map file in src/backend/utils/mb/Unicode, I
notice of a typo in it.

 > static const pg_mb_radix_tree euc_jp_from_unicode_tree =
 > {
 > ..
 >   0x0000, /* offset of table for 1-byte inputs */
 > ...
 >   0x0040, /* offset of table for 2-byte inputs */
 > ...
 >   0x02c3, /* offset of table for 3-byte inputs */
 > ...
!>   0x0000, /* offset of table for 3-byte inputs */
 >   0x00, /* b4_1_lower */
 >   0x00, /* b4_1_upper */
 > ...
 > };

Yeah, the line above prefixed by '!' is apparently a typo of "4-byte
inputs", which comes from a typo in convutils.pm.

Fortunately make maintainer-clean; make all in the directory results
in no other differences so we can apply the attached patch to fix the
all propagated typos.

I don't think no backpatch is needed.

regards.

-- 
Kyotaro Horiguchi
NTT Open Source Software Center
diff --git a/src/backend/utils/mb/Unicode/big5_to_utf8.map b/src/backend/utils/mb/Unicode/big5_to_utf8.map
index aa417bc9c8..b8332fb958 100644
--- a/src/backend/utils/mb/Unicode/big5_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/big5_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree big5_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/convutils.pm b/src/backend/utils/mb/Unicode/convutils.pm
index 5ad38514be..1155d8bb14 100644
--- a/src/backend/utils/mb/Unicode/convutils.pm
+++ b/src/backend/utils/mb/Unicode/convutils.pm
@@ -579,7 +579,7 @@ sub print_radix_table
     printf $out "  0x%02x, /* b3_3_lower */\n", $b3_3_lower;
     printf $out "  0x%02x, /* b3_3_upper */\n", $b3_3_upper;
     printf $out "\n";
-    printf $out "  0x%04x, /* offset of table for 3-byte inputs */\n",
+    printf $out "  0x%04x, /* offset of table for 4-byte inputs */\n",
       $b4root;
     printf $out "  0x%02x, /* b4_1_lower */\n", $b4_1_lower;
     printf $out "  0x%02x, /* b4_1_upper */\n", $b4_1_upper;
diff --git a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
index 3801e08ef5..f8503d30c3 100644
--- a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_cn_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
index d2da4a383b..4b6d4e0d42 100644
--- a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_jis_2004_to_unicode_tree =
   0xa1, /* b3_3_lower */
   0xfe, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
index 96b79a58a1..ee23de2c8f 100644
--- a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_jp_to_unicode_tree =
   0xa1, /* b3_3_lower */
   0xfe, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map b/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
index bf1fc4a98b..5d6bcc53ae 100644
--- a/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_kr_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
index 22af269924..5a1774617f 100644
--- a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_tw_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x1899, /* offset of table for 3-byte inputs */
+  0x1899, /* offset of table for 4-byte inputs */
   0x8e, /* b4_1_lower */
   0x8e, /* b4_1_upper */
   0xa1, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
index 79072fe767..1c90d48fba 100644
--- a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree gb18030_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x5f3f, /* offset of table for 3-byte inputs */
+  0x5f3f, /* offset of table for 4-byte inputs */
   0x81, /* b4_1_lower */
   0x84, /* b4_1_upper */
   0x30, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/gbk_to_utf8.map b/src/backend/utils/mb/Unicode/gbk_to_utf8.map
index 35d710c3b3..df5de79792 100644
--- a/src/backend/utils/mb/Unicode/gbk_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/gbk_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree gbk_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
index 83961d1327..3360484d58 100644
--- a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_10_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
index 9efdc9a207..462f1425d0 100644
--- a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_13_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
index 766b8703b3..177227d85b 100644
--- a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_14_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
index 6ab3f21146..f78caa39d7 100644
--- a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_15_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
index a639654034..c45bb61a14 100644
--- a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_16_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
index 9046300917..bf86cb42ab 100644
--- a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_2_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
index c716fc3159..5f7a1b0185 100644
--- a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_3_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
index 3b711062e4..4222a60e10 100644
--- a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_4_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
index 447a4f194f..dd4987eb5b 100644
--- a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_5_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
index 5b8be5b6a0..c47f30f045 100644
--- a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_6_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
index f4dd1d815a..6b26060157 100644
--- a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_7_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
index 194a1b8ebc..393788fa0c 100644
--- a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_8_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
index eec3cb8c1b..fced425016 100644
--- a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_9_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/johab_to_utf8.map b/src/backend/utils/mb/Unicode/johab_to_utf8.map
index 07d2505c26..bfc28341cf 100644
--- a/src/backend/utils/mb/Unicode/johab_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/johab_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree johab_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
index 0988748585..2631c3a216 100644
--- a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree koi8r_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/koi8u_to_utf8.map b/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
index 2b2ddc9b81..61265f4e30 100644
--- a/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree koi8u_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
index e591a1135b..a5081027ba 100644
--- a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree shift_jis_2004_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/sjis_to_utf8.map b/src/backend/utils/mb/Unicode/sjis_to_utf8.map
index 2b60a240b6..ece6c03ca7 100644
--- a/src/backend/utils/mb/Unicode/sjis_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/sjis_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree sjis_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/uhc_to_utf8.map b/src/backend/utils/mb/Unicode/uhc_to_utf8.map
index 65d57639da..b8ecc37d37 100644
--- a/src/backend/utils/mb/Unicode/uhc_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/uhc_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree uhc_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_big5.map b/src/backend/utils/mb/Unicode/utf8_to_big5.map
index ea26c8a80e..07c2198f09 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_big5.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_big5.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree big5_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map b/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
index 488d3be043..8190b4c646 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_cn_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
index fa90f3958f..9e5d08c4f6 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_jis_2004_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x6fc1, /* offset of table for 3-byte inputs */
+  0x6fc1, /* offset of table for 4-byte inputs */
   0xf0, /* b4_1_lower */
   0xf0, /* b4_1_upper */
   0xa0, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map b/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
index 1adcedf26d..d5c75ad7a2 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_jp_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map b/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
index b5c4823850..6befea1e48 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_kr_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map b/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
index e3a35ea653..25b196ffd0 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree euc_tw_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
index 5acee4554c..6c6b660beb 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree gb18030_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_gbk.map b/src/backend/utils/mb/Unicode/utf8_to_gbk.map
index 528b054a63..cf12b4a694 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_gbk.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_gbk.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree gbk_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
index 899eaf9753..033c0dd702 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_10_from_unicode_tree =
   0x95, /* b3_3_lower */
   0x95, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
index cae360fc9d..e0f0c156e7 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_13_from_unicode_tree =
   0x99, /* b3_3_lower */
   0x9e, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
index bb2bc3b55f..8fd1da37b2 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_14_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xb3, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
index 6bc8a32908..e7f85a7628 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_15_from_unicode_tree =
   0xac, /* b3_3_lower */
   0xac, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
index 59a2ecac90..0e1ffbd07a 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_16_from_unicode_tree =
   0x9d, /* b3_3_lower */
   0xac, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
index 94b65c2c62..5fac57ce40 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_2_from_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
index c489fda08d..09b38d83e3 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_3_from_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
index b273518f18..1f640b207d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_4_from_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
index 75c6ea615a..0628667ae6 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_5_from_unicode_tree =
   0x96, /* b3_3_lower */
   0x96, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
index b237f54be1..70b6e57bed 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_6_from_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
index 656b80abd1..f8ee0c2450 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_7_from_unicode_tree =
   0x95, /* b3_3_lower */
   0xaf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
index b512bd5ed7..abba18931e 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_8_from_unicode_tree =
   0x8e, /* b3_3_lower */
   0x97, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
index 98a2eabbc8..fe03f58f65 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree iso8859_9_from_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_johab.map b/src/backend/utils/mb/Unicode/utf8_to_johab.map
index 8a4e69a9e5..42c05df03d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_johab.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_johab.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree johab_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_koi8r.map b/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
index bdc52ad09a..05d6866ec4 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree koi8r_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbc, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_koi8u.map b/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
index bb5c56a6de..ecb022ae28 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree koi8u_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbc, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
index b756b5f157..5be947703c 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree shift_jis_2004_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x6fe2, /* offset of table for 3-byte inputs */
+  0x6fe2, /* offset of table for 4-byte inputs */
   0xf0, /* b4_1_lower */
   0xf0, /* b4_1_upper */
   0xa0, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_sjis.map b/src/backend/utils/mb/Unicode/utf8_to_sjis.map
index 72acc0977c..a6c59d5d0c 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_sjis.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_sjis.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree sjis_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_uhc.map b/src/backend/utils/mb/Unicode/utf8_to_uhc.map
index 4e8b857cd7..308b2b2fd1 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_uhc.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_uhc.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree uhc_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1250.map b/src/backend/utils/mb/Unicode/utf8_to_win1250.map
index 3d83c18fe6..c1ac893c1b 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1250.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1250.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1250_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1251.map b/src/backend/utils/mb/Unicode/utf8_to_win1251.map
index d4160171ed..2f4e25c856 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1251.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1251.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1251_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1252.map b/src/backend/utils/mb/Unicode/utf8_to_win1252.map
index b98b73f239..5796f33fea 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1252.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1252.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1252_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1253.map b/src/backend/utils/mb/Unicode/utf8_to_win1253.map
index e1812715a0..724faa0089 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1253.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1253.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1253_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1254.map b/src/backend/utils/mb/Unicode/utf8_to_win1254.map
index fd601c168a..218bae4098 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1254.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1254.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1254_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1255.map b/src/backend/utils/mb/Unicode/utf8_to_win1255.map
index 1ece6434eb..6d7d36fe05 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1255.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1255.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1255_from_unicode_tree =
   0x8e, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1256.map b/src/backend/utils/mb/Unicode/utf8_to_win1256.map
index 7fce018a1d..25f459ab76 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1256.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1256.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1256_from_unicode_tree =
   0x8c, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1257.map b/src/backend/utils/mb/Unicode/utf8_to_win1257.map
index 1453887ead..47207f6c8c 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1257.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1257.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1257_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1258.map b/src/backend/utils/mb/Unicode/utf8_to_win1258.map
index dedcb109c0..ad19505eef 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1258.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1258.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1258_from_unicode_tree =
   0x93, /* b3_3_lower */
   0xba, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win866.map b/src/backend/utils/mb/Unicode/utf8_to_win866.map
index 50e88c901f..28ed3990b0 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win866.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win866.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win866_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbc, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win874.map b/src/backend/utils/mb/Unicode/utf8_to_win874.map
index fe8ded3da4..e5a9e8fa16 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win874.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win874.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win874_from_unicode_tree =
   0x80, /* b3_3_lower */
   0xbf, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1250_to_utf8.map b/src/backend/utils/mb/Unicode/win1250_to_utf8.map
index 67909ecf43..d1957a365d 100644
--- a/src/backend/utils/mb/Unicode/win1250_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1250_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1250_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1251_to_utf8.map b/src/backend/utils/mb/Unicode/win1251_to_utf8.map
index 4d5a7efef7..a1f82745c3 100644
--- a/src/backend/utils/mb/Unicode/win1251_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1251_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1251_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1252_to_utf8.map b/src/backend/utils/mb/Unicode/win1252_to_utf8.map
index c09e134b1a..09113aa47b 100644
--- a/src/backend/utils/mb/Unicode/win1252_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1252_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1252_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1253_to_utf8.map b/src/backend/utils/mb/Unicode/win1253_to_utf8.map
index 2298371a7e..3d0d6e8247 100644
--- a/src/backend/utils/mb/Unicode/win1253_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1253_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1253_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1254_to_utf8.map b/src/backend/utils/mb/Unicode/win1254_to_utf8.map
index 84e009709f..9ad9c85dfe 100644
--- a/src/backend/utils/mb/Unicode/win1254_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1254_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1254_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1255_to_utf8.map b/src/backend/utils/mb/Unicode/win1255_to_utf8.map
index 133a06b9a3..2fdec17a88 100644
--- a/src/backend/utils/mb/Unicode/win1255_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1255_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1255_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1256_to_utf8.map b/src/backend/utils/mb/Unicode/win1256_to_utf8.map
index 6f55484b0f..33142bb8e1 100644
--- a/src/backend/utils/mb/Unicode/win1256_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1256_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1256_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1257_to_utf8.map b/src/backend/utils/mb/Unicode/win1257_to_utf8.map
index a58bb81d97..1f79ea7387 100644
--- a/src/backend/utils/mb/Unicode/win1257_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1257_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1257_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win1258_to_utf8.map b/src/backend/utils/mb/Unicode/win1258_to_utf8.map
index 97e203aef7..9890004724 100644
--- a/src/backend/utils/mb/Unicode/win1258_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1258_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win1258_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win866_to_utf8.map b/src/backend/utils/mb/Unicode/win866_to_utf8.map
index ed674f9503..68807650f4 100644
--- a/src/backend/utils/mb/Unicode/win866_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win866_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win866_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */
diff --git a/src/backend/utils/mb/Unicode/win874_to_utf8.map b/src/backend/utils/mb/Unicode/win874_to_utf8.map
index dcccaf0363..a07c34a662 100644
--- a/src/backend/utils/mb/Unicode/win874_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win874_to_utf8.map
@@ -26,7 +26,7 @@ static const pg_mb_radix_tree win874_to_unicode_tree =
   0x00, /* b3_3_lower */
   0x00, /* b3_3_upper */
 
-  0x0000, /* offset of table for 3-byte inputs */
+  0x0000, /* offset of table for 4-byte inputs */
   0x00, /* b4_1_lower */
   0x00, /* b4_1_upper */
   0x00, /* b4_2_lower */