postgrespro
diff --git a/‎src/backend/utils/adt/pg_locale.c
Lines changed: 6 additions & 1 deletion b/‎src/backend/utils/adt/pg_locale.c
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/backend/utils/mb/conv.c
Lines changed: 2 additions & 2 deletions b/‎src/backend/utils/mb/conv.c
Lines changed: 2 additions & 2 deletions
@@ -1555,9 +1555,14 @@ init_icu_converter(void)
 	UConverter *conv;
 
 	if (icu_converter)
-		return;
+		return;					/* already done */
 
 	icu_encoding_name = get_encoding_name_for_icu(GetDatabaseEncoding());
+	if (!icu_encoding_name)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("encoding \"%s\" not supported by ICU",
+						pg_encoding_to_char(GetDatabaseEncoding()))));
 
 	status = U_ZERO_ERROR;
 	conv = ucnv_open(icu_encoding_name, &status);
 
@@ -115,7 +115,7 @@ mic2latin(const unsigned char *mic, unsigned char *p, int len,
 		}
 		else
 		{
-			int			l = pg_mic_mblen(mic);
+			int			l = pg_mule_mblen(mic);
 
 			if (len < l)
 				report_invalid_encoding(PG_MULE_INTERNAL, (const char *) mic,
@@ -217,7 +217,7 @@ mic2latin_with_table(const unsigned char *mic,
 		}
 		else
 		{
-			int			l = pg_mic_mblen(mic);
+			int			l = pg_mule_mblen(mic);
 
 			if (len < l)
 				report_invalid_encoding(PG_MULE_INTERNAL, (const char *) mic,
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ mic2latin(const unsigned char mic, unsigned char p, int len,`
`115`	`115`	`}`
`116`	`116`	`else`
`117`	`117`	`{`
`118`		`- int l = pg_mic_mblen(mic);`
	`118`	`+ int l = pg_mule_mblen(mic);`
`119`	`119`
`120`	`120`	`if (len < l)`
`121`	`121`	`report_invalid_encoding(PG_MULE_INTERNAL, (const char *) mic,`
`@@ -217,7 +217,7 @@ mic2latin_with_table(const unsigned char *mic,`
`217`	`217`	`}`
`218`	`218`	`else`
`219`	`219`	`{`
`220`		`- int l = pg_mic_mblen(mic);`
	`220`	`+ int l = pg_mule_mblen(mic);`
`221`	`221`
`222`	`222`	`if (len < l)`
`223`	`223`	`report_invalid_encoding(PG_MULE_INTERNAL, (const char *) mic,`