From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 16 Sep 2005 19:39:02 +0000 (+0000)
Subject: Adjust regression for new cancel query message.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=ca8ee6ca051abcbc9cf21ff164dd7da50b0d80cf;p=users%2Fbernd%2Fpostgres.git

Adjust regression for new cancel query message.
---

diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out
index d6a165e94e..f36d1a2428 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';