postgrespro
diff --git a/‎contrib/hstore/hstore_op.c
Lines changed: 2 additions & 2 deletions b/‎contrib/hstore/hstore_op.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎doc/src/sgml/func.sgml
Lines changed: 2 additions & 2 deletions b/‎doc/src/sgml/func.sgml
Lines changed: 2 additions & 2 deletions
diff --git a/‎doc/src/sgml/gist.sgml
Lines changed: 2 additions & 2 deletions b/‎doc/src/sgml/gist.sgml
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/access/heap/tuptoaster.c
Lines changed: 0 additions & 2 deletions b/‎src/backend/access/heap/tuptoaster.c
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/backend/access/transam/varsup.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/access/transam/varsup.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/access/transam/xact.c
Lines changed: 2 additions & 2 deletions b/‎src/backend/access/transam/xact.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/access/transam/xlog.c
Lines changed: 7 additions & 7 deletions b/‎src/backend/access/transam/xlog.c
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/backend/access/transam/xlogfuncs.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/access/transam/xlogfuncs.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/access/transam/xlogutils.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/access/transam/xlogutils.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/commands/vacuum.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/commands/vacuum.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/executor/execExpr.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/executor/execExpr.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/executor/nodeTidscan.c
Lines changed: 2 additions & 2 deletions b/‎src/backend/executor/nodeTidscan.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/port/win32/crashdump.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/port/win32/crashdump.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/postmaster/pgstat.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/postmaster/pgstat.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/postmaster/syslogger.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/postmaster/syslogger.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/replication/logical/reorderbuffer.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/replication/logical/reorderbuffer.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/replication/walsender.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/replication/walsender.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/statistics/extended_stats.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/statistics/extended_stats.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/storage/file/fd.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/storage/file/fd.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/storage/lmgr/lmgr.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/storage/lmgr/lmgr.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/tsearch/dict_synonym.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/tsearch/dict_synonym.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/tsearch/ts_parse.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/tsearch/ts_parse.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/utils/adt/arrayfuncs.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/utils/adt/arrayfuncs.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/utils/adt/network.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/utils/adt/network.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/utils/adt/pg_locale.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/utils/adt/pg_locale.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/utils/mmgr/freepage.c
Lines changed: 2 additions & 2 deletions b/‎src/backend/utils/mmgr/freepage.c
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/bin/pg_basebackup/walmethods.h
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_basebackup/walmethods.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_dump/pg_backup_tar.c
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_dump/pg_backup_tar.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_dump/pg_dump.c
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_dump/pg_dump.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_rewind/parsexlog.c
Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_rewind/parsexlog.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_upgrade/pg_upgrade.h
Lines changed: 0 additions & 3 deletions b/‎src/bin/pg_upgrade/pg_upgrade.h
Lines changed: 0 additions & 3 deletions
diff --git a/‎src/include/access/brin_xlog.h
Lines changed: 1 addition & 1 deletion b/‎src/include/access/brin_xlog.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/include/access/heapam_xlog.h
Lines changed: 1 addition & 1 deletion b/‎src/include/access/heapam_xlog.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/include/access/htup_details.h
Lines changed: 1 addition & 1 deletion b/‎src/include/access/htup_details.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/include/access/xlog_internal.h
Lines changed: 1 addition & 1 deletion b/‎src/include/access/xlog_internal.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/include/commands/explain.h
Lines changed: 1 addition & 1 deletion b/‎src/include/commands/explain.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/include/fe_utils/psqlscan_int.h
Lines changed: 1 addition & 1 deletion b/‎src/include/fe_utils/psqlscan_int.h
Lines changed: 1 addition & 1 deletion
@@ -682,8 +682,8 @@ hstore_slice_to_hstore(PG_FUNCTION_ARGS)
 	}
 
 	/*
-	 * we don't use uniquePairs here because we know that the pairs list is
-	 * already sorted and uniq'ed.
+	 * we don't use hstoreUniquePairs here because we know that the pairs list
+	 * is already sorted and uniq'ed.
 	 */
 
 	out = hstorePairs(out_pairs, out_count, bufsiz);
 
@@ -2875,7 +2875,7 @@
       </row>
 
       <row>
-       <entry><literal>tcvn_to_utf8</literal></entry>
+       <entry><literal>windows_1258_to_utf8</literal></entry>
        <entry><literal>WIN1258</literal></entry>
        <entry><literal>UTF8</literal></entry>
       </row>
@@ -3037,7 +3037,7 @@
       </row>
 
       <row>
-       <entry><literal>utf8_to_tcvn</literal></entry>
+       <entry><literal>utf8_to_windows_1258</literal></entry>
        <entry><literal>UTF8</literal></entry>
        <entry><literal>WIN1258</literal></entry>
       </row>
 
@@ -697,8 +697,8 @@ my_picksplit(PG_FUNCTION_ARGS)
 
         /*
          * Choose where to put the index entries and update unionL and unionR
-         * accordingly. Append the entries to either v_spl_left or
-         * v_spl_right, and care about the counters.
+         * accordingly. Append the entries to either v-&gt;spl_left or
+         * v-&gt;spl_right, and care about the counters.
          */
 
         if (my_choice_is_left(unionL, curl, unionR, curr))
 
@@ -44,8 +44,6 @@
 #include "utils/typcache.h"
 
 
-#undef TOAST_DEBUG
-
 /*
  *	The information at the start of the compressed toast data.
  */
 
@@ -488,7 +488,7 @@ ForceTransactionIdLimitUpdate(void)
 	if (!TransactionIdIsValid(xidVacLimit))
 		return true;			/* this shouldn't happen anymore either */
 	if (TransactionIdFollowsOrEquals(nextXid, xidVacLimit))
-		return true;			/* past VacLimit, don't delay updating */
+		return true;			/* past xidVacLimit, don't delay updating */
 	if (!SearchSysCacheExists1(DATABASEOID, ObjectIdGetDatum(oldestXidDB)))
 		return true;			/* could happen, per comments above */
 	return false;
 
@@ -92,8 +92,8 @@ int			synchronous_commit = SYNCHRONOUS_COMMIT_ON;
  * in the user backend, so we need some additional bookkeeping.
  *
  * XactTopFullTransactionId stores the XID of our toplevel transaction, which
- * will be the same as TopTransactionState.fullTransactionId in an ordinary
- * backend; but in a parallel backend, which does not have the entire
+ * will be the same as TopTransactionStateData.fullTransactionId in an
+ * ordinary backend; but in a parallel backend, which does not have the entire
  * transaction state, it will instead be copied from the backend that started
  * the parallel operation.
  *
 
@@ -626,7 +626,7 @@ typedef struct XLogCtlData
 
 	/*
 	 * These values do not change after startup, although the pointed-to pages
-	 * and xlblocks values certainly do.  xlblock values are protected by
+	 * and xlblocks values certainly do.  xlblocks values are protected by
 	 * WALBufMappingLock.
 	 */
 	char	   *pages;			/* buffers for unwritten XLOG pages */
@@ -743,7 +743,7 @@ static ControlFileData *ControlFile = NULL;
  */
 #define UsableBytesInPage (XLOG_BLCKSZ - SizeOfXLogShortPHD)
 
-/* Convert min_wal_size_mb and max wal_size_mb to equivalent segment count */
+/* Convert min_wal_size_mb and max_wal_size_mb to equivalent segment count */
 #define ConvertToXSegs(x, segsize)	\
 	(x / ((segsize) / (1024 * 1024)))
 
@@ -903,7 +903,7 @@ static XLogRecord *ReadRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 							  int emode, bool fetching_ckpt);
 static void CheckRecoveryConsistency(void);
 static XLogRecord *ReadCheckpointRecord(XLogReaderState *xlogreader,
-										XLogRecPtr RecPtr, int whichChkpti, bool report);
+										XLogRecPtr RecPtr, int whichChkpt, bool report);
 static bool rescanLatestTimeLine(void);
 static void WriteControlFile(void);
 static void ReadControlFile(void);
@@ -3049,9 +3049,9 @@ XLogBackgroundFlush(void)
 	else if (TimestampDifferenceExceeds(lastflush, now, WalWriterDelay))
 	{
 		/*
-		 * Flush the writes at least every WalWriteDelay ms. This is important
-		 * to bound the amount of time it takes for an asynchronous commit to
-		 * hit disk.
+		 * Flush the writes at least every WalWriterDelay ms. This is
+		 * important to bound the amount of time it takes for an asynchronous
+		 * commit to hit disk.
 		 */
 		WriteRqst.Flush = WriteRqst.Write;
 		lastflush = now;
@@ -8442,7 +8442,7 @@ LogCheckpointEnd(bool restartpoint)
  * Update the estimate of distance between checkpoints.
  *
  * The estimate is used to calculate the number of WAL segments to keep
- * preallocated, see XLOGFileSlop().
+ * preallocated, see XLOGfileslop().
  */
 static void
 UpdateCheckPointDistanceEstimate(uint64 nbytes)
 
@@ -267,7 +267,7 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
 	values[0] = LSNGetDatum(stoppoint);
 
 	tuplestore_putvalues(tupstore, tupdesc, values, nulls);
-	tuplestore_donestoring(typstore);
+	tuplestore_donestoring(tupstore);
 
 	return (Datum) 0;
 }
 
@@ -523,7 +523,7 @@ XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum,
 }
 
 /*
- * Struct actually returned by XLogFakeRelcacheEntry, though the declared
+ * Struct actually returned by CreateFakeRelcacheEntry, though the declared
  * return type is Relation.
  */
 typedef struct
 
@@ -863,7 +863,7 @@ get_all_vacuum_rels(int options)
  *	 DEAD or RECENTLY_DEAD (see HeapTupleSatisfiesVacuum).
  * - freezeLimit is the Xid below which all Xids are replaced by
  *	 FrozenTransactionId during vacuum.
- * - xidFullScanLimit (computed from table_freeze_age parameter)
+ * - xidFullScanLimit (computed from freeze_table_age parameter)
  *	 represents a minimum Xid value; a table whose relfrozenxid is older than
  *	 this will have a full-table vacuum applied to it, to freeze tuples across
  *	 the whole table.  Vacuuming a table younger than this value can use a
 
@@ -1776,7 +1776,7 @@ ExecInitExprRec(Expr *node, ExprState *state,
 				scratch.d.rowcompare_final.rctype = rcexpr->rctype;
 				ExprEvalPushStep(state, &scratch);
 
-				/* adjust jump targetss */
+				/* adjust jump targets */
 				foreach(lc, adjust_jumps)
 				{
 					ExprEvalStep *as = &state->steps[lfirst_int(lc)];
 
@@ -432,7 +432,7 @@ TidRecheck(TidScanState *node, TupleTableSlot *slot)
  *		Initial States:
  *		  -- the relation indicated is opened for scanning so that the
  *			 "cursor" is positioned before the first qualifying tuple.
- *		  -- tidPtr is -1.
+ *		  -- tss_TidPtr is -1.
  * ----------------------------------------------------------------
  */
 static TupleTableSlot *
@@ -498,7 +498,7 @@ ExecEndTidScan(TidScanState *node)
  *		scan keys, and opens the base and tid relations.
  *
  *		Parameters:
- *		  node: TidNode node produced by the planner.
+ *		  node: TidScan node produced by the planner.
  *		  estate: the execution state initialized in InitPlan.
  * ----------------------------------------------------------------
  */
 
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * win32_crashdump.c
+ * crashdump.c
  *		   Automatic crash dump creation for PostgreSQL on Windows
  *
  * The crashdump feature traps unhandled win32 exceptions produced by the
 
@@ -893,7 +893,7 @@ pgstat_report_stat(bool force)
 				this_msg->m_nentries = 0;
 			}
 		}
-		/* zero out TableStatus structs after use */
+		/* zero out PgStat_TableStatus structs after use */
 		MemSet(tsa->tsa_entries, 0,
 			   tsa->tsa_used * sizeof(PgStat_TableStatus));
 		tsa->tsa_used = 0;
 
@@ -1114,7 +1114,7 @@ write_syslogger_file(const char *buffer, int count, int destination)
 /*
  * Worker thread to transfer data from the pipe to the current logfile.
  *
- * We need this because on Windows, WaitforMultipleObjects does not work on
+ * We need this because on Windows, WaitForMultipleObjects does not work on
  * unnamed pipes: it always reports "signaled", so the blocking ReadFile won't
  * allow for SIGHUP; and select is for sockets only.
  */
 
@@ -3368,7 +3368,7 @@ ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname)
 
 
 /*
- * Check whether the TransactionOid 'xid' is in the pre-sorted array 'xip'.
+ * Check whether the TransactionId 'xid' is in the pre-sorted array 'xip'.
  */
 static bool
 TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)
 
@@ -866,7 +866,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 
 	parseCreateReplSlotOptions(cmd, &reserve_wal, &snapshot_action);
 
-	/* setup state for XLogReadPage */
+	/* setup state for XLogRead */
 	sendTimeLineIsHistoric = false;
 	sendTimeLine = ThisTimeLineID;
 
 
@@ -1189,7 +1189,7 @@ statext_clauselist_selectivity(PlannerInfo *root, List *clauses, int varRelid,
 }
 
 /*
- * examine_operator_expression
+ * examine_opclause_expression
  *		Split expression into Var and Const parts.
  *
  * Attempts to match the arguments to either (Var op Const) or (Const op Var),
 
@@ -269,7 +269,7 @@ static int	nextTempTableSpace = 0;
  * LruInsert	   - put a file at the front of the Lru ring and open it
  * ReleaseLruFile  - Release an fd by closing the last entry in the Lru ring
  * ReleaseLruFiles - Release fd(s) until we're under the max_safe_fds limit
- * AllocateVfd	   - grab a free (or new) file record (from VfdArray)
+ * AllocateVfd	   - grab a free (or new) file record (from VfdCache)
  * FreeVfd		   - free a file record
  *
  * The Least Recently Used ring is a doubly linked list that begins and
 
@@ -792,7 +792,7 @@ SpeculativeInsertionWait(TransactionId xid, uint32 token)
 }
 
 /*
- * XactLockTableWaitErrorContextCb
+ * XactLockTableWaitErrorCb
  *		Error context callback for transaction lock waits.
  */
 static void
 
@@ -37,7 +37,7 @@ typedef struct
  * Finds the next whitespace-delimited word within the 'in' string.
  * Returns a pointer to the first character of the word, and a pointer
  * to the next byte after the last character in the word (in *end).
- * Character '*' at the end of word will not be threated as word
+ * Character '*' at the end of word will not be treated as word
  * character if flags is not null.
  */
 static char *
 
@@ -282,7 +282,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
 				if (!dictExists)
 				{
 					/*
-					 * Dictionary can't work with current tpe of lexeme,
+					 * Dictionary can't work with current type of lexeme,
 					 * return to basic mode and redo all stored lexemes
 					 */
 					ld->curDictId = InvalidOid;
 
@@ -1997,7 +1997,7 @@ array_get_element_expanded(Datum arraydatum,
 
 /*
  * array_get_slice :
- *		   This routine takes an array and a range of indices (upperIndex and
+ *		   This routine takes an array and a range of indices (upperIndx and
  *		   lowerIndx), creates a new array structure for the referred elements
  *		   and returns a pointer to it.
  *
 
@@ -579,7 +579,7 @@ network_abbrev_abort(int memtupcount, SortSupport ssup)
  * IPv4 addresses have a maximum of 32 bits compared to IPv6's 64 bits, so in
  * IPv6 each part may be larger.
  *
- * inet/cdir types compare using these sorting rules. If inequality is detected
+ * inet/cidr types compare using these sorting rules. If inequality is detected
  * at any step, comparison is finished. If any rule is a tie, the algorithm
  * drops through to the next to break it:
  *
 
@@ -1916,7 +1916,7 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen,
 		 * error message by letting pg_verifymbstr check the string.  But it's
 		 * possible that the string is OK to us, and not OK to mbstowcs ---
 		 * this suggests that the LC_CTYPE locale is different from the
-		 * database encoding.  Give a generic error message if verifymbstr
+		 * database encoding.  Give a generic error message if pg_verifymbstr
 		 * can't find anything wrong.
 		 */
 		pg_verifymbstr(from, fromlen, false);	/* might not return */
 
@@ -742,8 +742,8 @@ FreePageBtreeConsolidate(FreePageManager *fpm, FreePageBtree *btp)
 
 	/*
 	 * If we can fit our keys onto our left sibling's page, consolidate. In
-	 * this case, we move our keys onto the other page rather than visca
-	 * versa, to avoid having to adjust ancestor keys.
+	 * this case, we move our keys onto the other page rather than vice versa,
+	 * to avoid having to adjust ancestor keys.
 	 */
 	np = FreePageBtreeFindLeftSibling(base, btp);
 	if (np != NULL && btp->hdr.nused + np->hdr.nused <= max)
 
@@ -81,7 +81,7 @@ struct WalWriteMethod
 /*
  * Available WAL methods:
  *	- WalDirectoryMethod - write WAL to regular files in a standard pg_wal
- *	- TarDirectoryMethod - write WAL to a tarfile corresponding to pg_wal
+ *	- WalTarMethod       - write WAL to a tarfile corresponding to pg_wal
  *						   (only implements the methods required for pg_basebackup,
  *						   not all those required for pg_receivewal)
  */
 
@@ -568,7 +568,7 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
 			}
 		}
 		else
-			fatal("internal error -- neither th nor fh specified in tarReadRaw()");
+			fatal("internal error -- neither th nor fh specified in _tarReadRaw()");
 	}
 
 	ctx->tarFHpos += res + used;
 
@@ -17834,7 +17834,7 @@ processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
 	}
 
 	/*
-	 * Now that all the TableInfoData objects have been created for all the
+	 * Now that all the TableDataInfo objects have been created for all the
 	 * extensions, check their FK dependencies and register them to try and
 	 * dump the data out in an order that they can be restored in.
 	 *
 
@@ -234,7 +234,7 @@ findLastCheckpoint(const char *datadir, XLogRecPtr forkptr, int tliIndex,
 	}
 }
 
-/* XLogreader callback function, to read a WAL page */
+/* XLogReader callback function, to read a WAL page */
 static int
 SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 				   int reqLen, XLogRecPtr targetRecPtr, char *readBuf,
 
@@ -15,9 +15,6 @@
 /* Use port in the private/dynamic port number range */
 #define DEF_PGUPORT			50432
 
-/* Allocate for null byte */
-#define USER_NAME_SIZE		128
-
 #define MAX_STRING			1024
 #define QUERY_ALLOC			8192
 
 
@@ -77,7 +77,7 @@ typedef struct xl_brin_insert
  * A cross-page update is the same as an insert, but also stores information
  * about the old tuple.
  *
- * Like in xlog_brin_update:
+ * Like in xl_brin_insert:
  * Backup block 0: new page, block data includes the new BrinTuple.
  * Backup block 1: revmap page
  *
 
@@ -168,7 +168,7 @@ typedef struct xl_heap_insert
  *
  * In block 0's data portion, there is an xl_multi_insert_tuple struct,
  * followed by the tuple data for each tuple. There is padding to align
- * each xl_multi_insert struct.
+ * each xl_multi_insert_tuple struct.
  */
 typedef struct xl_heap_multi_insert
 {
 
@@ -233,7 +233,7 @@ struct HeapTupleHeaderData
 
 /*
  * A tuple that has HEAP_XMAX_IS_MULTI and HEAP_XMAX_LOCK_ONLY but neither of
- * XMAX_EXCL_LOCK and XMAX_KEYSHR_LOCK must come from a tuple that was
+ * HEAP_XMAX_EXCL_LOCK and HEAP_XMAX_KEYSHR_LOCK must come from a tuple that was
  * share-locked in 9.2 or earlier and then pg_upgrade'd.
  *
  * In 9.2 and prior, HEAP_XMAX_IS_MULTI was only set when there were multiple
 
@@ -45,7 +45,7 @@ typedef struct XLogPageHeaderData
 	 * continue on the next page.  xlp_rem_len is the number of bytes
 	 * remaining from a previous page.
 	 *
-	 * Note that xl_rem_len includes backup-block data; that is, it tracks
+	 * Note that xlp_rem_len includes backup-block data; that is, it tracks
 	 * xl_tot_len not xl_len in the initial header.  Also note that the
 	 * continuation data isn't necessarily aligned.
 	 */
 
@@ -84,7 +84,7 @@ extern void ExplainPrintTriggers(ExplainState *es, QueryDesc *queryDesc);
 
 extern void ExplainPrintJITSummary(ExplainState *es, QueryDesc *queryDesc);
 extern void ExplainPrintJIT(ExplainState *es, int jit_flags,
-							struct JitInstrumentation *jit_instr, int worker_i);
+							struct JitInstrumentation *jit_instr, int worker_num);
 
 extern void ExplainQueryText(ExplainState *es, QueryDesc *queryDesc);
 
 
@@ -27,7 +27,7 @@
  * is the start state number, which is easy enough to manage --- usually,
  * in fact, we just need to set it to INITIAL when changing lexers.  But to
  * make that work at all, we must use re-entrant lexers, so that all the
- * relevant state is in the yyscanner_t attached to the PsqlScanState;
+ * relevant state is in the yyscan_t attached to the PsqlScanState;
  * if we were using lexers with separate static state we would soon end up
  * with dangling buffer pointers in one or the other.  Also note that this
  * is unlikely to work very nicely if the lexers aren't all built with the