Apply patch from Steven Singer for contrib/dbmirror. Changes:

-It fixes up some bugs with handling setval calls
-Adds upgrade instructions from prior versions
-Improved the sample config file
-Fixed some things in the clean_pending script

1 files changed, 7 insertions, 6 deletions

diff --git a/contrib/dbmirror/MirrorSetup.sql b/contrib/dbmirror/MirrorSetup.sql
index cae686f929..19ac1b280f 100644
--- a/contrib/dbmirror/MirrorSetup.sql
+++ b/contrib/dbmirror/MirrorSetup.sql
@@ -1,6 +1,5 @@
 BEGIN;
 
-SET autocommit TO 'on';
 
 CREATE FUNCTION "recordchange" () RETURNS trigger AS
 '$libdir/pending.so', 'recordchange' LANGUAGE 'C';
@@ -25,7 +24,7 @@ XID int4 NOT NULL,
 PRIMARY KEY (SeqId)
 );
 
-CREATE INDEX "dbmirror_Pending_XID_Index" ON dbmirror_Pending (XID);
+CREATE INDEX dbmirror_Pending_XID_Index ON dbmirror_Pending (XID);
 
 CREATE TABLE dbmirror_PendingData (
 SeqId int4 NOT NULL,
@@ -50,12 +49,14 @@ CASCADE ON DELETE CASCADE
 UPDATE pg_proc SET proname='nextval_pg' WHERE proname='nextval';
 
 CREATE FUNCTION pg_catalog.nextval(text) RETURNS int8  AS
-'/usr/local/postgresql-7.4/lib/pending.so', 'nextval' LANGUAGE 'C' STRICT;
+'$libdir/pending.so', 'nextval' LANGUAGE 'C' STRICT;
 
 
 UPDATE pg_proc set proname='setval_pg' WHERE proname='setval';
 
-CREATE FUNCTION pg_catalog.setval(text,int4) RETURNS int8  AS
-'/usr/local/postgresql-7.4/lib/pending.so', 'setval' LANGUAGE 'C' STRICT;
+CREATE FUNCTION pg_catalog.setval("unknown",integer,boolean) RETURNS int8  AS
+'$libdir/pending.so', 'setval' LANGUAGE 'C' STRICT;
+CREATE FUNCTION pg_catalog.setval("unknown",integer) RETURNS int8  AS
+'$libdir/pending.so', 'setval' LANGUAGE 'C' STRICT;
 
-COMMIT;
\ No newline at end of file
+COMMIT;