Commit a4d9d3e0 authored by Bruce Momjian's avatar Bruce Momjian

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
parent 914042fe
...@@ -33,7 +33,7 @@ ...@@ -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($$$$$) { ...@@ -660,7 +660,7 @@ sub mirrorSequence($$$$$) {
my $query; my $query;
my $sequenceValue = $pendingResult->getvalue($currentTuple,4); 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); sendQueryToSlaves($transId,$query);
return $currentTuple; return $currentTuple;
...@@ -960,7 +960,7 @@ sub openTransactionFile($$) ...@@ -960,7 +960,7 @@ sub openTransactionFile($$)
my $nowisdst; my $nowisdst;
($nowsec,$nowmin,$nowhour,$nowmday,$nowmon,$nowyear,$nowwday,$nowyday,$nowisdst) = ($nowsec,$nowmin,$nowhour,$nowmday,$nowmon,$nowyear,$nowwday,$nowyday,$nowisdst) =
localtime; 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, $::slaveInfo->{"MirrorHostId"},($nowyear+1900),($nowmon+1),$nowmday,$nowhour,$nowmin,
$nowsec,$XID); $nowsec,$XID);
......
/**************************************************************************** /****************************************************************************
* pending.c * pending.c
* $Id: 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.16 2004/02/17 03:34:35 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 * This file contains a trigger for Postgresql-7.x to record changes to tables
* to a pending table for mirroring. * to a pending table for mirroring.
...@@ -701,7 +701,7 @@ nextval(PG_FUNCTION_ARGS) ...@@ -701,7 +701,7 @@ nextval(PG_FUNCTION_ARGS)
debug_msg("dbmirror:nextval Set resTuple"); debug_msg("dbmirror:nextval Set resTuple");
nextSequenceValue =*(DatumGetPointer(SPI_getbinval(resTuple, nextSequenceValue =* (unsigned int *)(DatumGetPointer(SPI_getbinval(resTuple,
SPI_tuptable->tupdesc, SPI_tuptable->tupdesc,
1,&isNull))); 1,&isNull)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment