aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-09-16 19:39:02 +0000
committerBruce Momjian <bruce@momjian.us>2005-09-16 19:39:02 +0000
commitd5eab81313360c20e6141775b9b93bb7267c60d7 (patch)
treea371c1b20f9c69661e768277335d018775d57b78
parent098d204a6b8db56acc05e21b0a62ab1b6f9d90ec (diff)
downloadpostgresql-d5eab81313360c20e6141775b9b93bb7267c60d7.tar.gz
postgresql-d5eab81313360c20e6141775b9b93bb7267c60d7.zip
Adjust regression for new cancel query message.
-rw-r--r--src/test/regress/expected/prepared_xacts.out4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out
index d6a165e94e4..f36d1a2428c 100644
--- a/src/test/regress/expected/prepared_xacts.out
+++ b/src/test/regress/expected/prepared_xacts.out
@@ -159,7 +159,7 @@ SELECT gid FROM pg_prepared_xacts;
-- pxtest3 should be locked because of the pending DROP
set statement_timeout to 1000;
SELECT * FROM pxtest3;
-ERROR: canceling query due to user request
+ERROR: canceling query due to user request or statement timeout
reset statement_timeout;
-- Disconnect, we will continue testing in a different backend
\c -
@@ -174,7 +174,7 @@ SELECT gid FROM pg_prepared_xacts;
-- pxtest3 should still be locked because of the pending DROP
set statement_timeout to 1000;
SELECT * FROM pxtest3;
-ERROR: canceling query due to user request
+ERROR: canceling query due to user request or statement timeout
reset statement_timeout;
-- Commit table creation
COMMIT PREPARED 'regress-one';