summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFujii Masao <fujii@postgresql.org>2014-06-06 18:46:32 +0900
committerFujii Masao <fujii@postgresql.org>2014-06-06 18:48:09 +0900
commitbdc5400bc627e72a1fcf9d61459d0a34db58fca8 (patch)
tree5ec2eac0dfc71c86d6882e62b4ff72f8c8f80af5
parent4fb647827592f69d53ea5201f58dfb53aad95147 (diff)
Fix breakages of hot standby regression test.
This commit changes HS regression test so that it uses REPEATABLE READ transaction instead of SERIALIZABLE one because SERIALIZABLE transaction isolation level is not available in HS. Also this commit fixes VACUUM/ANALYZE label mixup. This was fixed in HEAD (commit 2985e16), but it should have been back-patched to 9.1 which had introduced SSI and forbidden SERIALIZABLE transaction in HS. Amit Langote
-rw-r--r--src/test/regress/expected/hs_standby_allowed.out2
-rw-r--r--src/test/regress/expected/hs_standby_disallowed.out2
-rw-r--r--src/test/regress/sql/hs_standby_allowed.sql2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/regress/expected/hs_standby_allowed.out b/src/test/regress/expected/hs_standby_allowed.out
index 1abe5f6fe94..c26c9822f63 100644
--- a/src/test/regress/expected/hs_standby_allowed.out
+++ b/src/test/regress/expected/hs_standby_allowed.out
@@ -49,7 +49,7 @@ select count(*) as should_be_1 from hs1;
(1 row)
end;
-begin transaction isolation level serializable;
+begin transaction isolation level repeatable read;
select count(*) as should_be_1 from hs1;
should_be_1
-------------
diff --git a/src/test/regress/expected/hs_standby_disallowed.out b/src/test/regress/expected/hs_standby_disallowed.out
index e7f4835092f..bc117413ffd 100644
--- a/src/test/regress/expected/hs_standby_disallowed.out
+++ b/src/test/regress/expected/hs_standby_disallowed.out
@@ -124,7 +124,7 @@ unlisten *;
ERROR: cannot execute UNLISTEN during recovery
-- disallowed commands
ANALYZE hs1;
-ERROR: cannot execute VACUUM during recovery
+ERROR: cannot execute ANALYZE during recovery
VACUUM hs2;
ERROR: cannot execute VACUUM during recovery
CLUSTER hs2 using hs1_pkey;
diff --git a/src/test/regress/sql/hs_standby_allowed.sql b/src/test/regress/sql/hs_standby_allowed.sql
index 58e2c010d33..7fc22148cbc 100644
--- a/src/test/regress/sql/hs_standby_allowed.sql
+++ b/src/test/regress/sql/hs_standby_allowed.sql
@@ -28,7 +28,7 @@ begin transaction read only;
select count(*) as should_be_1 from hs1;
end;
-begin transaction isolation level serializable;
+begin transaction isolation level repeatable read;
select count(*) as should_be_1 from hs1;
select count(*) as should_be_1 from hs1;
select count(*) as should_be_1 from hs1;