From e8ae01966115a35d3815e0445da5f78878f6dd14 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Sat, 2 Feb 2013 12:56:14 -0500
Subject: Adjust COPY FREEZE error message to be more accurate and consistent.

Per suggestions from Noah and Tom.
---
 src/test/regress/expected/copy2.out | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/test')

diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index 5777b24274..34fa131c52 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -334,12 +334,12 @@ SELECT * FROM vistest;
 COMMIT;
 TRUNCATE vistest;
 COPY vistest FROM stdin CSV FREEZE;
-ERROR:  cannot perform FREEZE because the table was not created or truncated in the current transaction
+ERROR:  cannot perform FREEZE because the table was not created or truncated in the current subtransaction
 BEGIN;
 TRUNCATE vistest;
 SAVEPOINT s1;
 COPY vistest FROM stdin CSV FREEZE;
-ERROR:  cannot perform FREEZE because of transaction activity after table creation or truncation
+ERROR:  cannot perform FREEZE because the table was not created or truncated in the current subtransaction
 COMMIT;
 BEGIN;
 INSERT INTO vistest VALUES ('z');
@@ -347,7 +347,7 @@ SAVEPOINT s1;
 TRUNCATE vistest;
 ROLLBACK TO SAVEPOINT s1;
 COPY vistest FROM stdin CSV FREEZE;
-ERROR:  cannot perform FREEZE because the table was not created or truncated in the current transaction
+ERROR:  cannot perform FREEZE because the table was not created or truncated in the current subtransaction
 COMMIT;
 CREATE FUNCTION truncate_in_subxact() RETURNS VOID AS
 $$
-- 
cgit v1.2.3