diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/transam/xact.c | 6 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index b3bf5cd973..dc5bbcd32e 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.53 1999/09/24 00:24:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.54 1999/09/28 11:41:03 vadim Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -632,7 +632,7 @@ RecordTransactionCommit() */ if (SharedBufferChanged) { - FlushBufferPool(!TransactionFlushEnabled()); + FlushBufferPool(); if (leak) ResetBufferPool(); @@ -646,7 +646,7 @@ RecordTransactionCommit() * Now write the log info to the disk too. */ leak = BufferPoolCheckLeak(); - FlushBufferPool(!TransactionFlushEnabled()); + FlushBufferPool(); } if (leak) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index f1b80d4027..2a7d60d3aa 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -2,6 +2,7 @@ #include <unistd.h> #include <errno.h> #include <sys/stat.h> +#include <sys/time.h> #include "postgres.h" #include "access/xlog.h" @@ -1376,12 +1377,10 @@ CreateCheckPoint(bool shutdown) /* Get REDO record ptr */ while (!TAS(&(XLogCtl->insert_lck))) { - struct timeval delay; + struct timeval delay = {0, 5000}; if (shutdown) elog(STOP, "XLog insert lock is busy while data base is shutting down"); - delay.tv_sec = 0; - delay.tv_usec = 0; (void) select(0, NULL, NULL, NULL, &delay); } freespace = ((char*) Insert->currpage) + BLCKSZ - Insert->currpos; @@ -1408,7 +1407,7 @@ CreateCheckPoint(bool shutdown) checkPoint.nextOid = ShmemVariableCache->nextOid; SpinRelease(OidGenLockId); - FlushBufferPool(false); + FlushBufferPool(); /* Get UNDO record ptr */ |