diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/nbtree.h | 4 | ||||
| -rw-r--r-- | src/include/miscadmin.h | 6 | ||||
| -rw-r--r-- | src/include/utils/tuplesort.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 62af3ca30e9..8601b802fcf 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.75 2003/12/21 01:23:06 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.76 2004/02/03 17:34:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -490,7 +490,7 @@ extern BTItem _bt_formitem(IndexTuple itup); */ typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */ -extern BTSpool *_bt_spoolinit(Relation index, bool isunique); +extern BTSpool *_bt_spoolinit(Relation index, bool isunique, bool isdead); extern void _bt_spooldestroy(BTSpool *btspool); extern void _bt_spool(BTItem btitem, BTSpool *btspool); extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index c62ab783a34..a7fe724533e 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.149 2004/01/30 15:57:04 momjian Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.150 2004/02/03 17:34:03 tgl Exp $ * * NOTES * some of the information in this file should be moved to @@ -207,8 +207,8 @@ extern int CTimeZone; extern bool enableFsync; extern bool allowSystemTableMods; -extern DLLIMPORT int SortMem; -extern int VacuumMem; +extern DLLIMPORT int work_mem; +extern DLLIMPORT int maintenance_work_mem; /* * A few postmaster startup options are exported here so the diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index bc4f4376ecb..70cbbfbabed 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.14 2003/11/29 22:41:16 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.15 2004/02/03 17:34:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -39,13 +39,13 @@ typedef struct Tuplesortstate Tuplesortstate; extern Tuplesortstate *tuplesort_begin_heap(TupleDesc tupDesc, int nkeys, Oid *sortOperators, AttrNumber *attNums, - bool randomAccess); + int workMem, bool randomAccess); extern Tuplesortstate *tuplesort_begin_index(Relation indexRel, bool enforceUnique, - bool randomAccess); + int workMem, bool randomAccess); extern Tuplesortstate *tuplesort_begin_datum(Oid datumType, Oid sortOperator, - bool randomAccess); + int workMem, bool randomAccess); extern void tuplesort_puttuple(Tuplesortstate *state, void *tuple); |