aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-07-22 12:15:19 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2017-07-22 12:15:19 -0400
commit991c8b04fc5d61a308bb00ea34a7ff710051c53f (patch)
treeea1d070b361edfbcd2266fe6d44fbd6c896d9ba4
parentde38489b926e3e5af84f22cf4788fe4498e13c72 (diff)
downloadpostgresql-991c8b04fc5d61a308bb00ea34a7ff710051c53f.tar.gz
postgresql-991c8b04fc5d61a308bb00ea34a7ff710051c53f.zip
Update expected results for collate.linux.utf8 regression test.
I believe this changed as a consequence of commit 54baa4813: trying to clone the "C" collation now produces a true clone with collencoding -1, hence the error message if it's duplicate no longer specifies an encoding. Per buildfarm member crake, which apparently hadn't been running this test for the last few weeks.
-rw-r--r--src/test/regress/expected/collate.linux.utf8.out4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/regress/expected/collate.linux.utf8.out b/src/test/regress/expected/collate.linux.utf8.out
index 26275c3fb3e..6b7318613a3 100644
--- a/src/test/regress/expected/collate.linux.utf8.out
+++ b/src/test/regress/expected/collate.linux.utf8.out
@@ -996,9 +996,9 @@ BEGIN
END
$$;
CREATE COLLATION test0 FROM "C"; -- fail, duplicate name
-ERROR: collation "test0" for encoding "UTF8" already exists
+ERROR: collation "test0" already exists
CREATE COLLATION IF NOT EXISTS test0 FROM "C"; -- ok, skipped
-NOTICE: collation "test0" for encoding "UTF8" already exists, skipping
+NOTICE: collation "test0" already exists, skipping
CREATE COLLATION IF NOT EXISTS test0 (locale = 'foo'); -- ok, skipped
NOTICE: collation "test0" for encoding "UTF8" already exists, skipping
do $$