git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c

index d73af9e6782b9bbb2505d9472e01f96a92ab9d01..343fa082d664a832a17c03fdf16ccb0b13c409f8 100644 (file)

--- a/src/backend/access/nbtree/nbtree.c

+++ b/src/backend/access/nbtree/nbtree.c

* Portions Copyright (c) 1994, Regents of the University of California

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.98 2003年02月23日 22:43:08 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.99 2003年02月23日 23:27:21 tgl Exp $

*

*-------------------------------------------------------------------------

*/

bool FastBuild = true; /* use SORT instead of insertion build */

-/*

- * TEMPORARY FLAG FOR TESTING NEW FIX TREE

- * CODE WITHOUT AFFECTING ANYONE ELSE

- */

-bool FixBTree = true;

-

static void _bt_restscan(IndexScanDesc scan);

static void btbuildCallback(Relation index,

HeapTuple htup,

diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc

index 772ce49aae4864033224ad9add11736a3b3ad5cd..0268396c7414c507bc0a24627f025023814b35da 100755 (executable)

--- a/src/backend/utils/misc/check_guc

+++ b/src/backend/utils/misc/check_guc

## postgresql.conf.sample, it should be listed here so that it

## can be ignored

INTENTIONALLY_NOT_INCLUDED="pre_auth_delay lc_messages lc_monetary \

-lc_time lc_numeric fixbtree server_encoding session_authorization"

+lc_time lc_numeric server_encoding session_authorization"

### What options are listed in postgresql.conf.sample, but don't appear

### in guc.c?

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c

index 2f99d3d5f41c56f0b350c6d90a04953766baf960..2582843829c6fa3a7a1bc8d5718388335ea5073e 100644 (file)

--- a/src/backend/utils/misc/guc.c

+++ b/src/backend/utils/misc/guc.c

* command, configuration file, and command line options.

* See src/backend/utils/misc/README for more information.

*

- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.114 2003年02月06日 20:25:33 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.115 2003年02月23日 23:27:21 tgl Exp $

*

* Copyright 2000 by PostgreSQL Global Development Group

* Written by Peter Eisentraut <peter_e@gmx.net>.

extern bool autocommit;

extern int CommitDelay;

extern int CommitSiblings;

-extern bool FixBTree;

#ifdef HAVE_SYSLOG

extern char *Syslog_facility;

{"australian_timezones", PGC_USERSET}, &Australian_timezones,

false, ClearDateCache, NULL

},

- {

- {"fixbtree", PGC_POSTMASTER}, &FixBTree,

- true, NULL, NULL

- },

{

{"password_encryption", PGC_USERSET}, &Password_encryption,

true, NULL, NULL