3 files changed, 11 insertions, 9 deletions
diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c
index 99aeaddb5d2..8aac01cf4cb 100644
--- a/src/backend/utils/adt/domains.c
+++ b/src/backend/utils/adt/domains.c
@@ -127,7 +127,7 @@ domain_state_setup(Oid domainType, bool binary, MemoryContext mcxt)
  * execExpr*.c, but we execute each constraint separately, rather than
  * compiling them in-line within a larger expression.
  *
- * If escontext points to an ErrorStateContext, any failures are reported
+ * If escontext points to an ErrorSaveContext, any failures are reported
  * there, otherwise they are ereport'ed.  Note that we do not attempt to do
  * soft reporting of errors raised during execution of CHECK constraints.
  */
diff --git a/src/test/regress/expected/regproc.out b/src/test/regress/expected/regproc.out
index 0c5e1d4be63..a034fbb3465 100644
--- a/src/test/regress/expected/regproc.out
+++ b/src/test/regress/expected/regproc.out
@@ -268,10 +268,10 @@ SELECT regtype('ng_catalog.int4');
 ERROR:  schema "ng_catalog" does not exist
 LINE 1: SELECT regtype('ng_catalog.int4');
                        ^
+\set VERBOSITY sqlstate \\ -- error message is encoding-dependent
 SELECT regcollation('ng_catalog."POSIX"');
-ERROR:  collation "ng_catalog.POSIX" for encoding "SQL_ASCII" does not exist
-LINE 1: SELECT regcollation('ng_catalog."POSIX"');
-                            ^
+ERROR:  42704
+\set VERBOSITY default
 -- schemaname not applicable
 SELECT regrole('regress_regrole_test');
 ERROR:  role "regress_regrole_test" does not exist
@@ -454,10 +454,10 @@ SELECT pg_input_error_message('ng_catalog.pg_class', 'regclass');
  relation "ng_catalog.pg_class" does not exist
 (1 row)
 
-SELECT pg_input_error_message('ng_catalog."POSIX"', 'regcollation');
-                        pg_input_error_message                        
-----------------------------------------------------------------------
- collation "ng_catalog.POSIX" for encoding "SQL_ASCII" does not exist
+SELECT pg_input_is_valid('ng_catalog."POSIX"', 'regcollation');
+ pg_input_is_valid 
+-------------------
+ f
 (1 row)
 
 SELECT pg_input_error_message('no_such_config', 'regconfig');
diff --git a/src/test/regress/sql/regproc.sql b/src/test/regress/sql/regproc.sql
index aa1f1bb17a2..2cb8c9a2531 100644
--- a/src/test/regress/sql/regproc.sql
+++ b/src/test/regress/sql/regproc.sql
@@ -74,7 +74,9 @@ SELECT regproc('ng_catalog.now');
 SELECT regprocedure('ng_catalog.abs(numeric)');
 SELECT regclass('ng_catalog.pg_class');
 SELECT regtype('ng_catalog.int4');
+\set VERBOSITY sqlstate \\ -- error message is encoding-dependent
 SELECT regcollation('ng_catalog."POSIX"');
+\set VERBOSITY default
 
 -- schemaname not applicable
 
@@ -124,7 +126,7 @@ SELECT to_regnamespace('foo.bar');
 -- Test soft-error API
 
 SELECT pg_input_error_message('ng_catalog.pg_class', 'regclass');
-SELECT pg_input_error_message('ng_catalog."POSIX"', 'regcollation');
+SELECT pg_input_is_valid('ng_catalog."POSIX"', 'regcollation');
 SELECT pg_input_error_message('no_such_config', 'regconfig');
 SELECT pg_input_error_message('no_such_dictionary', 'regdictionary');
 SELECT pg_input_error_message('Nonexistent', 'regnamespace');