← Back to branch summary

~ubuntu-branches/ubuntu/natty/postgresql-8.4/natty-security

« back to all changes in this revision

Viewing changes to src/backend/access/transam/multixact.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-11 16:59:35 UTC
  • mfrom: (5.1.1 karmic)
  • Revision ID: james.westby@ubuntu.com-20090711165935-jfwin6gfrxf0gfsi
Tags: 8.4.0-2
http://bugs.debian.org/536139
* debian/libpq-dev.install: Ship catalog/genbki.h. (Closes: #536139)
* debian/rules: Drop --enable-cassert for final release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/access/transam/multixact.c
42
42
 * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
43
43
 * Portions Copyright (c) 1994, Regents of the University of California
44
44
 *
45
 
 * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.30 2009/01/20 18:59:37 heikki Exp $
 
45
 * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.31 2009/06/26 20:29:04 tgl Exp $
46
46
 *
47
47
 *-------------------------------------------------------------------------
48
48
 */
1543
1543
         * SimpleLruTruncate would get confused.  It seems best not to risk
1544
1544
         * removing any data during recovery anyway, so don't truncate.
1545
1545
         */
1546
 
        if (!InRecovery)
 
1546
        if (!RecoveryInProgress())
1547
1547
                TruncateMultiXact();
1548
1548
 
1549
1549
        TRACE_POSTGRESQL_MULTIXACT_CHECKPOINT_DONE(true);