diff options
44 files changed, 49 insertions, 65 deletions
diff --git a/contrib/jsonb_plperl/jsonb_plperlu--1.0.sql b/contrib/jsonb_plperl/jsonb_plperlu--1.0.sql index 5a5e475ad30..aa84b37bef7 100644 --- a/contrib/jsonb_plperl/jsonb_plperlu--1.0.sql +++ b/contrib/jsonb_plperl/jsonb_plperlu--1.0.sql @@ -1,4 +1,4 @@ -/* contrib/json_plperl/jsonb_plperl--1.0.sql */ +/* contrib/jsonb_plperl/jsonb_plperlu--1.0.sql */ -- complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "CREATE EXTENSION jsonb_plperlu" to load this file. \quit diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c index eaeb221877f..2adaf2c8755 100644 --- a/contrib/pgcrypto/pgp-compress.c +++ b/contrib/pgcrypto/pgp-compress.c @@ -311,7 +311,7 @@ pgp_decompress_filter(PullFilter **res, PGP_Context *ctx, PullFilter *src) { return pullf_create(res, &decompress_filter, ctx, src); } -#else /* !HAVE_ZLIB */ +#else /* !HAVE_LIBZ */ int pgp_compress_filter(PushFilter **res, PGP_Context *ctx, PushFilter *dst) diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml index 02ed975ec2f..cf432628721 100644 --- a/doc/src/sgml/problems.sgml +++ b/doc/src/sgml/problems.sgml @@ -252,7 +252,7 @@ C library, processor, memory information, and so on. In most cases it is sufficient to report the vendor and version, but do not assume everyone knows what exactly <quote>Debian</quote> - contains or that everyone runs on i386s. If you have + contains or that everyone runs on x86_64. If you have installation problems then information about the toolchain on your machine (compiler, <application>make</application>, and so on) is also necessary. diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 57730214993..42647b05265 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -69,7 +69,7 @@ * currently executing. * * Fillfactor can be set because it applies only to subsequent changes made to - * data blocks, as documented in heapio.c + * data blocks, as documented in hio.c * * n_distinct options can be set at ShareUpdateExclusiveLock because they * are only used during ANALYZE, which uses a ShareUpdateExclusiveLock, diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 57c3b830d85..21de8ed714d 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -92,7 +92,7 @@ typedef struct /* * The following fields represent the items in this segment. If 'items' is - * not NULL, it contains a palloc'd array of the itemsin this segment. If + * not NULL, it contains a palloc'd array of the items in this segment. If * 'seg' is not NULL, it contains the items in an already-compressed * format. It can point to an on-disk page (!modified), or a palloc'd * segment in memory. If both are set, they must represent the same items. diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 8108fbb7d8e..46d08e06350 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -663,7 +663,7 @@ gistgettuple(IndexScanDesc scan, ScanDirection dir) } /* - * Check the last returned tuple and add it to killitems if + * Check the last returned tuple and add it to killedItems if * necessary */ if (scan->kill_prior_tuple diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 49df05653b3..7d1b219bbc8 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -120,7 +120,7 @@ gistjoinvector(IndexTuple *itvec, int *len, IndexTuple *additvec, int addlen) } /* - * make plain IndexTupleVector + * make plain IndexTuple vector */ IndexTupleData * diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index a07bd27a0e3..487103fb798 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -793,7 +793,7 @@ _hash_initbitmapbuffer(Buffer buf, uint16 bmsize, bool initpage) * be confused into returning the same tuple more than once or some tuples * not at all by the rearrangement we are performing here. To prevent * any concurrent scan to cross the squeeze scan we use lock chaining - * similar to hasbucketcleanup. Refer comments atop hashbucketcleanup. + * similar to hashbucketcleanup. Refer comments atop hashbucketcleanup. * * We need to retain a pin on the primary bucket to ensure that no concurrent * split can start. diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 376ee2a63b5..defdc9b4085 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -509,7 +509,7 @@ _hash_init_metabuffer(Buffer buf, double num_tuples, RegProcedure procid, * Choose the number of initial bucket pages to match the fill factor * given the estimated number of tuples. We round up the result to the * total number of buckets which has to be allocated before using its - * _hashm_spare element. However always force at least 2 bucket pages. The + * hashm_spares element. However always force at least 2 bucket pages. The * upper limit is determined by considerations explained in * _hash_expandtable(). */ diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index d768b9b061c..94309949fac 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -102,7 +102,7 @@ static void MultiXactIdWait(MultiXactId multi, MultiXactStatus status, uint16 in static bool ConditionalMultiXactIdWait(MultiXactId multi, MultiXactStatus status, uint16 infomask, Relation rel, int *remaining); static XLogRecPtr log_heap_new_cid(Relation relation, HeapTuple tup); -static HeapTuple ExtractReplicaIdentity(Relation rel, HeapTuple tup, bool key_modified, +static HeapTuple ExtractReplicaIdentity(Relation rel, HeapTuple tup, bool key_changed, bool *copy); diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 0efe3ce9995..a0d22173cef 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -256,7 +256,7 @@ heap_page_prune(Relation relation, Buffer buffer, TransactionId OldestXmin, MarkBufferDirty(buffer); /* - * Emit a WAL HEAP_CLEAN record showing what we did + * Emit a WAL XLOG_HEAP2_CLEAN record showing what we did */ if (RelationNeedsWAL(relation)) { diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 42aaa5bad62..2599b5d3425 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -557,8 +557,8 @@ systable_endscan(SysScanDesc sysscan) * we could do a heapscan and sort, but the uses are in places that * probably don't need to still work with corrupted catalog indexes.) * For the moment, therefore, these functions are merely the thinnest of - * wrappers around index_beginscan/index_getnext. The main reason for their - * existence is to centralize possible future support of lossy operators + * wrappers around index_beginscan/index_getnext_slot. The main reason for + * their existence is to centralize possible future support of lossy operators * in catalog scans. */ SysScanDesc diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c index 557dd18d7e8..1cf28ecf2fd 100644 --- a/src/backend/access/spgist/spgscan.c +++ b/src/backend/access/spgist/spgscan.c @@ -643,7 +643,7 @@ spgInnerTest(SpGistScanOpaque so, SpGistSearchItem *item, continue; /* - * Use infinity distances if innerConsistent() failed to return + * Use infinity distances if innerConsistentFn() failed to return * them or if is a NULL item (their distances are really unused). */ distances = out.distances ? out.distances[i] : so->infDistances; diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index d78f706ff7f..34c74d96f8e 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -891,7 +891,7 @@ ExtendCLOG(TransactionId newestXact) * Remove all CLOG segments before the one holding the passed transaction ID * * Before removing any CLOG data, we must flush XLOG to disk, to ensure - * that any recently-emitted HEAP_FREEZE records have reached disk; otherwise + * that any recently-emitted FREEZE_PAGE records have reached disk; otherwise * a crash and restart might leave us with some unfrozen tuples referencing * removed CLOG data. We choose to emit a special TRUNCATE XLOG record too. * Replaying the deletion from XLOG is not critical, since the files could diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index b6c9353cbd2..da3d2509860 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -9158,7 +9158,7 @@ CreateRestartPoint(int flags) /* * Update pg_control, using current time. Check that it still shows - * IN_ARCHIVE_RECOVERY state and an older checkpoint, else do nothing; + * DB_IN_ARCHIVE_RECOVERY state and an older checkpoint, else do nothing; * this is a quick hack to make sure nothing really bad happens if somehow * we get here after the end-of-recovery checkpoint. */ diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index ee878d70a91..2d9a8e9d541 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -775,7 +775,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, NULL, true, /* islocal */ 0, /* inhcount */ - true, /* isnoinherit */ + true, /* noinherit */ isInternal); /* is_internal */ } diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index cb4ab4b21e9..2342ca30185 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -2988,8 +2988,8 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans, numTransArgs = pertrans->numTransInputs + 1; /* - * Set up infrastructure for calling the transfn. Note that invtrans - * is not needed here. + * Set up infrastructure for calling the transfn. Note that + * invtransfn is not needed here. */ build_aggregate_transfn_expr(inputTypes, numArguments, diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 74f8d89bcb1..b8eb83b2e0a 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -2369,7 +2369,7 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI, /* * The last canSetTag query sets the status values returned to the * caller. Be careful to free any tuptables not returned, to - * avoid intratransaction memory leak. + * avoid intra-transaction memory leak. */ if (canSetTag) { diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 7d8907b2b42..d7ef942973c 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -2835,7 +2835,7 @@ satisfies_hash_partition(PG_FUNCTION_ARGS) PartitionKey key; int j; - /* Open parent relation and fetch partition keyinfo */ + /* Open parent relation and fetch partition key info */ parent = try_relation_open(parentId, AccessShareLock); if (parent == NULL) PG_RETURN_NULL(); diff --git a/src/backend/port/win32_sema.c b/src/backend/port/win32_sema.c index f08fbd16908..013c122451d 100644 --- a/src/backend/port/win32_sema.c +++ b/src/backend/port/win32_sema.c @@ -127,7 +127,6 @@ PGSemaphoreReset(PGSemaphore sema) * PGSemaphoreLock * * Lock a semaphore (decrement count), blocking if count would be < 0. - * Serve the interrupt if interruptOK is true. */ void PGSemaphoreLock(PGSemaphore sema) diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index ea02973dc73..ae6780011b8 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -3130,7 +3130,7 @@ DisplayXidCache(void) /* ---------------------------------------------- - * KnownAssignedTransactions sub-module + * KnownAssignedTransactionIds sub-module * ---------------------------------------------- */ diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 54ea69f7f16..4d8db1a0604 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -1855,7 +1855,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, /* * Was this an "ISO time" with embedded field labels? An - * example is "h04m05s06" - thomas 2001-02-04 + * example is "h04mm05s06" - thomas 2001-02-04 */ if (ptype != 0) { diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 7969f6f5843..ac04c4a57bc 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -510,7 +510,7 @@ fillJsonbValue(JsonbContainer *container, int index, * "raw scalar" pseudo array to append it - the actual scalar should be passed * next and it will be added as the only member of the array. * - * Values of type jvbBinary, which are rolled up arrays and objects, + * Values of type jbvBinary, which are rolled up arrays and objects, * are unpacked before being added to the result. */ JsonbValue * diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index bb67e014996..778d186f5b8 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -308,7 +308,7 @@ oidvectorsend(PG_FUNCTION_ARGS) } /* - * oidparse - get OID from IConst/FConst node + * oidparse - get OID from ICONST/FCONST node */ Oid oidparse(Node *node) diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index 4f7bafd142e..696a7fdf914 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -1152,7 +1152,7 @@ tsvector_concat(PG_FUNCTION_ARGS) /* * Compare two strings by tsvector rules. * - * if isPrefix = true then it returns zero value iff b has prefix a + * if prefix = true then it returns zero value iff b has prefix a */ int32 tsCompareString(char *a, int lena, char *b, int lenb, bool prefix) diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 9b640ccd406..99c34516bd6 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -217,7 +217,7 @@ fmgr_info_cxt_security(Oid functionId, FmgrInfo *finfo, MemoryContext mcxt, /* * For an ordinary builtin function, we should never get here - * because the isbuiltin() search above will have succeeded. + * because the fmgr_isbuiltin() search above will have succeeded. * However, if the user has done a CREATE FUNCTION to create an * alias for a builtin function, we can end up here. In that case * we have to look up the function by name. The name of the diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index ef9fc15ac36..6690d781379 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -1093,7 +1093,7 @@ AtEOXact_Snapshot(bool isCommit, bool resetXmin) * prevent a warning below. * * As with the FirstXactSnapshot, we don't need to free resources of - * the snapshot iself as it will go away with the memory context. + * the snapshot itself as it will go away with the memory context. */ foreach(lc, exportedSnapshots) { diff --git a/src/common/md5.c b/src/common/md5.c index 24b96eb3149..55eaeed8286 100644 --- a/src/common/md5.c +++ b/src/common/md5.c @@ -277,7 +277,7 @@ bytesToHex(uint8 b[16], char *s) * * OUTPUT hexsum the MD5 sum as a '\0'-terminated string of * hexadecimal digits. an MD5 sum is 16 bytes long. - * each byte is represented by two heaxadecimal + * each byte is represented by two hexadecimal * characters. you thus need to provide an array * of 33 characters, including the trailing '\0'. * diff --git a/src/include/access/ginblock.h b/src/include/access/ginblock.h index 5fd397c1360..e7d49b152eb 100644 --- a/src/include/access/ginblock.h +++ b/src/include/access/ginblock.h @@ -171,9 +171,6 @@ typedef struct GinMetaPageData GinItemPointerGetBlockNumber(p) == (BlockNumber)0) #define ItemPointerSetMax(p) \ ItemPointerSet((p), InvalidBlockNumber, (OffsetNumber)0xffff) -#define ItemPointerIsMax(p) \ - (GinItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff && \ - GinItemPointerGetBlockNumber(p) == InvalidBlockNumber) #define ItemPointerSetLossyPage(p, b) \ ItemPointerSet((p), (b), (OffsetNumber)0xffff) #define ItemPointerIsLossyPage(p) \ diff --git a/src/include/access/ginxlog.h b/src/include/access/ginxlog.h index 2c5d743cace..7ef3bcf7658 100644 --- a/src/include/access/ginxlog.h +++ b/src/include/access/ginxlog.h @@ -127,7 +127,7 @@ typedef struct ginxlogSplit /* * Vacuum simply WAL-logs the whole page, when anything is modified. This - * is functionally identical to heap_newpage records, but is kept separate for + * is functionally identical to XLOG_FPI records, but is kept separate for * debugging purposes. (When inspecting the WAL stream, it's easier to see * what's going on when GIN vacuum records are marked as such, not as heap * records.) This is currently only used for entry tree leaf pages. diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index f6cdca83eab..9629db9df4e 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -195,14 +195,14 @@ typedef struct xl_multi_insert_tuple * * Backup blk 0: new page * - * If XLOG_HEAP_PREFIX_FROM_OLD or XLOG_HEAP_SUFFIX_FROM_OLD flags are set, + * If XLH_UPDATE_PREFIX_FROM_OLD or XLH_UPDATE_SUFFIX_FROM_OLD flags are set, * the prefix and/or suffix come first, as one or two uint16s. * * After that, xl_heap_header and new tuple data follow. The new tuple * data doesn't include the prefix and suffix, which are copied from the * old tuple on replay. * - * If HEAP_CONTAINS_NEW_TUPLE_DATA flag is given, the tuple data is + * If XLH_UPDATE_CONTAINS_NEW_TUPLE flag is given, the tuple data is * included even if a full-page image was taken. * * Backup blk 1: old page, if different. (no data, just a reference to the blk) @@ -217,8 +217,8 @@ typedef struct xl_heap_update OffsetNumber new_offnum; /* new tuple's offset */ /* - * If XLOG_HEAP_CONTAINS_OLD_TUPLE or XLOG_HEAP_CONTAINS_OLD_KEY flags are - * set, a xl_heap_header struct and tuple data for the old tuple follows. + * If XLH_UPDATE_CONTAINS_OLD_TUPLE or XLH_UPDATE_CONTAINS_OLD_KEY flags + * are set, xl_heap_header and tuple data for the old tuple follow. */ } xl_heap_update; diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h index 4a389387325..e0d1178f245 100644 --- a/src/include/access/spgist_private.h +++ b/src/include/access/spgist_private.h @@ -328,7 +328,7 @@ typedef struct SpGistLeafTupleData { unsigned int tupstate:2, /* LIVE/REDIRECT/DEAD/PLACEHOLDER */ size:30; /* large enough for any palloc'able value */ - OffsetNumber nextOffset; /* next tuple in chain, or InvalidOffset */ + OffsetNumber nextOffset; /* next tuple in chain, or InvalidOffsetNumber */ ItemPointerData heapPtr; /* TID of represented heap tuple */ /* leaf datum follows */ } SpGistLeafTupleData; diff --git a/src/include/access/xact.h b/src/include/access/xact.h index a20726afa0e..d7145517047 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -283,8 +283,8 @@ typedef struct xl_xact_abort /* xl_xact_xinfo follows if XLOG_XACT_HAS_INFO */ /* xl_xact_dbinfo follows if XINFO_HAS_DBINFO */ - /* xl_xact_subxacts follows if HAS_SUBXACT */ - /* xl_xact_relfilenodes follows if HAS_RELFILENODES */ + /* xl_xact_subxacts follows if XINFO_HAS_SUBXACT */ + /* xl_xact_relfilenodes follows if XINFO_HAS_RELFILENODES */ /* No invalidation messages needed. */ /* xl_xact_twophase follows if XINFO_HAS_TWOPHASE */ /* twophase_gid follows if XINFO_HAS_GID. As a null-terminated string. */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 30541361301..1a8ca98a8c3 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -300,7 +300,7 @@ typedef struct AggStatePerHashData int numhashGrpCols; /* number of columns in hash table */ int largestGrpColIdx; /* largest col required for hashing */ AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */ - AttrNumber *hashGrpColIdxHash; /* indices in hashtbl tuples */ + AttrNumber *hashGrpColIdxHash; /* indices in hash table tuples */ Agg *aggnode; /* original Agg node, for numGroups etc. */ } AggStatePerHashData; diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 60c56157993..0339b98041d 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -544,7 +544,7 @@ extern int pg_mbstrlen_with_len(const char *mbstr, int len); extern int pg_mbcliplen(const char *mbstr, int len, int limit); extern int pg_encoding_mbcliplen(int encoding, const char *mbstr, int len, int limit); -extern int pg_mbcharcliplen(const char *mbstr, int len, int imit); +extern int pg_mbcharcliplen(const char *mbstr, int len, int limit); extern int pg_encoding_max_length(int encoding); extern int pg_database_encoding_max_length(void); extern mbcharacter_incrementer pg_database_encoding_character_incrementer(void); diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 8e35cf0a037..2d903c82b80 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -159,15 +159,9 @@ /* Define to 1 if you have the <editline/readline.h> header file. */ /* #undef HAVE_EDITLINE_READLINE_H */ -/* Define to 1 if you have the `fcvt' function. */ -#define HAVE_FCVT 1 - /* Define to 1 if you have the `fdatasync' function. */ /* #undef HAVE_FDATASYNC */ -/* Define to 1 if you have finite(). */ -#define HAVE_FINITE 1 - /* Define to 1 if you have the `fpclass' function. */ /* #undef HAVE_FPCLASS */ @@ -469,9 +463,6 @@ /* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */ /* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN */ -/* Define to 1 if the system has the type `struct sockaddr_un'. */ -/* #undef HAVE_STRUCT_SOCKADDR_UN */ - /* Define to 1 if `tm_zone' is member of `struct tm'. */ /* #undef HAVE_STRUCT_TM_TM_ZONE */ @@ -481,9 +472,6 @@ /* Define to 1 if you have the `sync_file_range' function. */ /* #undef HAVE_SYNC_FILE_RANGE */ -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - /* Define to 1 if you have the syslog interface. */ /* #undef HAVE_SYSLOG */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 5b275dc9850..741c5f4809f 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1999-2019, PostgreSQL Global Development Group * * The PostgreSQL routines for a DateTime/int/float/numeric formatting, - * inspire with Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. + * inspired by the Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. * * Karel Zak * diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h index 2fe7d32fec2..ac52b75f51d 100644 --- a/src/include/utils/jsonb.h +++ b/src/include/utils/jsonb.h @@ -367,7 +367,7 @@ extern JsonbValue *findJsonbValueFromContainer(JsonbContainer *sheader, extern JsonbValue *getIthJsonbValueFromContainer(JsonbContainer *sheader, uint32 i); extern JsonbValue *pushJsonbValue(JsonbParseState **pstate, - JsonbIteratorToken seq, JsonbValue *jbVal); + JsonbIteratorToken seq, JsonbValue *jbval); extern JsonbIterator *JsonbIteratorInit(JsonbContainer *container); extern JsonbIteratorToken JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested); diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index d9c10ffcbaf..2f2ace35b05 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -59,7 +59,7 @@ typedef enum IndexAttrBitmapKind } IndexAttrBitmapKind; extern Bitmapset *RelationGetIndexAttrBitmap(Relation relation, - IndexAttrBitmapKind keyAttrs); + IndexAttrBitmapKind attrKind); extern void RelationGetExclusionInfo(Relation indexRelation, Oid **operators, diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 4394b420a15..4e2016c7aea 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -2073,9 +2073,9 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator, * offset - offset between ith and (i+1)th entry in an array, normally * that means sizeof(type) * ind_type - type of indicator variable - * ind_value - pointer to indicator variable + * ind_pointer - pointer to indicator variable * ind_varcharsize - empty - * ind_arraysize - arraysize of indicator array + * ind_arrsize - arraysize of indicator array * ind_offset - indicator offset *------ */ diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index efd9f3aa719..e830ee737e7 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -275,8 +275,8 @@ PGTYPEStimestamp_to_asc(timestamp tstamp) *tm = &tt; char buf[MAXDATELEN + 1]; fsec_t fsec; - int DateStyle = 1; /* this defaults to ISO_DATES, shall we make - * it an option? */ + int DateStyle = 1; /* this defaults to USE_ISO_DATES, shall we + * make it an option? */ if (TIMESTAMP_NOT_FINITE(tstamp)) EncodeSpecialTimestamp(tstamp, buf); diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y index dea95f42308..a82930e81d9 100644 --- a/src/pl/plpgsql/src/pl_gram.y +++ b/src/pl/plpgsql/src/pl_gram.y @@ -3691,7 +3691,7 @@ plpgsql_sql_error_callback(void *arg) internalerrposition(myerrpos + errpos - cbarg->leaderlen - 1); } - /* In any case, flush errposition --- we want internalerrpos only */ + /* In any case, flush errposition --- we want internalerrposition only */ errposition(0); } diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index eecd2032d87..b318854d6c2 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -1634,7 +1634,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid, /************************************************************ * prefix procedure body with - * upvar #0 <internal_procname> GD + * upvar #0 <internal_proname> GD * and with appropriate setting of arguments ************************************************************/ Tcl_DStringAppend(&proc_internal_body, "upvar #0 ", -1); diff --git a/src/test/recovery/t/011_crash_recovery.pl b/src/test/recovery/t/011_crash_recovery.pl index 5dc52412cad..526a3481fb5 100644 --- a/src/test/recovery/t/011_crash_recovery.pl +++ b/src/test/recovery/t/011_crash_recovery.pl @@ -51,7 +51,7 @@ my $xid = $stdout; chomp($xid); is($node->safe_psql('postgres', qq[SELECT txid_status('$xid');]), - 'in progress', 'own xid is in-progres'); + 'in progress', 'own xid is in-progress'); # Crash and restart the postmaster $node->stop('immediate'); |