Attached is are a few small fixes for dbmirror.

1. Fixed bug where sequences were being mirrored incorrectly if they
exceeded 127
2. Fixed a bug in the perl script with mirroring sequences(John
Burtenshaw sent an email to patches describing the bug in March but I
htink he forgot to attach his patch)
3. The dates/times in the transaction files will always use 2 digits.

Steven Singer

diff --git a/contrib/dbmirror/DBMirror.pl b/contrib/dbmirror/DBMirror.pl
index 1eb917b..98592c6 100755 (executable)
--- a/contrib/dbmirror/DBMirror.pl
+++ b/contrib/dbmirror/DBMirror.pl
@@ -33,7 +33,7 @@
 # 
 #
 ##############################################################################
-# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.8 2004/02/17 03:34:35 momjian Exp $ 
+# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.9 2004/04/22 03:48:38 momjian Exp $ 
 #
 ##############################################################################
 
@@ -660,7 +660,7 @@ sub mirrorSequence($$$$$) {
 
     my $query;
     my $sequenceValue = $pendingResult->getvalue($currentTuple,4);
-    $query = sprintf("select setval(%s,%s)",$sequenceName,$sequenceValue);
+    $query = sprintf("select setval('%s',%s)",$sequenceName,$sequenceValue);
 
     sendQueryToSlaves($transId,$query);
     return $currentTuple;
@@ -960,7 +960,7 @@ sub openTransactionFile($$)
     my $nowisdst;
     ($nowsec,$nowmin,$nowhour,$nowmday,$nowmon,$nowyear,$nowwday,$nowyday,$nowisdst) =
        localtime;
-    my $fileName=sprintf(">%s/%s_%d-%d-%d_%d:%d:%dXID%d.sql", $::slaveInfo->{'TransactionFileDirectory'},
+    my $fileName=sprintf(">%s/%s_%02d-%02d-%02d_%02d:%02d:%dXID%d.sql", $::slaveInfo->{'TransactionFileDirectory'},
                         $::slaveInfo->{"MirrorHostId"},($nowyear+1900),($nowmon+1),$nowmday,$nowhour,$nowmin,
                         $nowsec,$XID);
     

diff --git a/contrib/dbmirror/pending.c b/contrib/dbmirror/pending.c
index 24fb71b..7e6ac65 100644 (file)
--- a/contrib/dbmirror/pending.c
+++ b/contrib/dbmirror/pending.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.16 2004/02/17 03:34:35 momjian Exp $
- * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.16 2004/02/17 03:34:35 momjian Exp $
+ * $Id: pending.c,v 1.17 2004/04/22 03:48:38 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.17 2004/04/22 03:48:38 momjian Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -701,7 +701,7 @@ nextval(PG_FUNCTION_ARGS)
 
   debug_msg("dbmirror:nextval Set resTuple");
 
-  nextSequenceValue =*(DatumGetPointer(SPI_getbinval(resTuple,
+  nextSequenceValue =* (unsigned int *)(DatumGetPointer(SPI_getbinval(resTuple,
                                                     SPI_tuptable->tupdesc,
                                                     1,&isNull)));