diff --git a/contrib/test_decoding/expected/ddl.out b/contrib/test_decoding/expected/ddl.out index 9a28b5ddc5a..d55fb3a667f 100644 --- a/contrib/test_decoding/expected/ddl.out +++ b/contrib/test_decoding/expected/ddl.out @@ -428,7 +428,7 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'inc -- test whether a known, but not yet logged toplevel xact, followed by a -- subxact commit is handled correctly BEGIN; -SELECT pg_current_xact_id() != '0'; -- so no fixed xid apears in the outfile +SELECT pg_current_xact_id() != '0'; -- so no fixed xid appears in the outfile ?column? ---------- t diff --git a/contrib/test_decoding/sql/ddl.sql b/contrib/test_decoding/sql/ddl.sql index 4f76bed72c1..57285a828c7 100644 --- a/contrib/test_decoding/sql/ddl.sql +++ b/contrib/test_decoding/sql/ddl.sql @@ -236,7 +236,7 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'inc -- test whether a known, but not yet logged toplevel xact, followed by a -- subxact commit is handled correctly BEGIN; -SELECT pg_current_xact_id() != '0'; -- so no fixed xid apears in the outfile +SELECT pg_current_xact_id() != '0'; -- so no fixed xid appears in the outfile SAVEPOINT a; INSERT INTO tr_sub(path) VALUES ('4-top-1-#1'); RELEASE SAVEPOINT a; diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml index b5e0392ad27..b6c37ccef26 100644 --- a/doc/src/sgml/user-manag.sgml +++ b/doc/src/sgml/user-manag.sgml @@ -346,7 +346,7 @@ ALTER ROLE myname SET enable_indexscan TO off; role using SET ROLE. However, since any user who has ADMIN OPTION on a role can grant membership in that role to any other user, the CREATEROLE user can gain - access to the created role by simplying granting that role back to + access to the created role by simply granting that role back to themselves with the INHERIT and/or SET options. Thus, the fact that privileges are not inherited by default nor is SET ROLE granted by default is a safeguard against diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 244957a2483..9bdc70c702e 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -4051,7 +4051,7 @@ recurse_push_qual(Node *setOp, Query *topquery, * * extra_used_attrs can be passed as non-NULL to mark any columns (offset by * FirstLowInvalidHeapAttributeNumber) that we should not remove. This - * parameter is modifed by the function, so callers must make a copy if they + * parameter is modified by the function, so callers must make a copy if they * need to use the passed in Bitmapset after calling this function. * * To avoid affecting column numbering in the targetlist, we don't physically diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index e3824efe9b5..65adf04c4eb 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -436,7 +436,7 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent, * the number-of-tuples estimate to equal the parent table; if it * is partial then we have to use the same methods as we would for * a table, except we can be sure that the index is not larger - * than the table. We must ignore partitioned indexes here as as + * than the table. We must ignore partitioned indexes here as * there are not physical indexes. */ if (indexRelation->rd_rel->relkind != RELKIND_PARTITIONED_INDEX) diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index ebaf555d569..f88389de847 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -1771,7 +1771,7 @@ static void pgoutput_stream_stop(struct LogicalDecodingContext *ctx, ReorderBufferTXN *txn) { - /* we should be streaming a trasanction */ + /* we should be streaming a transaction */ Assert(in_streaming); OutputPluginPrepareWrite(ctx, true); diff --git a/src/backend/utils/adt/xid8funcs.c b/src/backend/utils/adt/xid8funcs.c index 5d79f838a3e..24271dfff73 100644 --- a/src/backend/utils/adt/xid8funcs.c +++ b/src/backend/utils/adt/xid8funcs.c @@ -678,7 +678,7 @@ pg_xact_status(PG_FUNCTION_ARGS) Assert(TransactionIdIsValid(xid)); /* - * Like when doing visiblity checks on a row, check whether the + * Like when doing visibility checks on a row, check whether the * transaction is still in progress before looking into the CLOG. * Otherwise we would incorrectly return "committed" for a transaction * that is committing and has already updated the CLOG, but hasn't diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 9dd624b3ae0..34de62e2260 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6273,7 +6273,7 @@ ProcessGUCArray(ArrayType *array, ArrayType *usersetArray, /* * USER SET values are applicable only for PGC_USERSET parameters. We - * use InvalidOid as role in order to evade possible privileges of the + * use InvalidOid as role in order to avoid possible privileges of the * current user. */ if (!DatumGetBool(userSetDatum)) diff --git a/src/bin/pg_amcheck/t/002_nonesuch.pl b/src/bin/pg_amcheck/t/002_nonesuch.pl index 58be2c694d0..e3cfae9cd4a 100644 --- a/src/bin/pg_amcheck/t/002_nonesuch.pl +++ b/src/bin/pg_amcheck/t/002_nonesuch.pl @@ -324,7 +324,7 @@ $node->command_checks_all( qr/pg_amcheck: warning: no connectable databases to check matching "no_such_database\.public\.foo_idx"/, qr/pg_amcheck: error: no relations to check/, ], - 'checking otherwise existent objets in the wrong databases'); + 'checking otherwise existent objects in the wrong databases'); ######################################### diff --git a/src/bin/pg_basebackup/bbstreamer.h b/src/bin/pg_basebackup/bbstreamer.h index f5c3c0cfff9..f999e635d98 100644 --- a/src/bin/pg_basebackup/bbstreamer.h +++ b/src/bin/pg_basebackup/bbstreamer.h @@ -165,7 +165,7 @@ bbstreamer_buffer_bytes(bbstreamer *streamer, const char **data, int *len, } /* - * This is a convenence method for use when implementing a bbstreamer; it is + * This is a convenience method for use when implementing a bbstreamer; it is * not for use by outsider callers. It attempts to add enough data to the * bbstreamer's buffer to reach a length of target_bytes and adjusts '*len' * and '*data' accordingly. It returns true if the target length has been diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 7b7acc80448..71a1319865d 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -997,11 +997,11 @@ dumpRoleMembership(PGconn *conn) /* * We can't dump these GRANT commands in arbitrary order, because a role * that is named as a grantor must already have ADMIN OPTION on the - * role for which it is granting permissions, except for the boostrap + * role for which it is granting permissions, except for the bootstrap * superuser, who can always be named as the grantor. * * We handle this by considering these grants role by role. For each role, - * we initially consider the only allowable grantor to be the boostrap + * we initially consider the only allowable grantor to be the bootstrap * superuser. Every time we grant ADMIN OPTION on the role to some user, * that user also becomes an allowable grantor. We make repeated passes * over the grants for the role, each time dumping those whose grantors diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 47b2c87f7f2..70ed034e70a 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -3541,7 +3541,7 @@ printVerboseErrorMessages(CState *st, pg_time_usec_t *now, bool is_retry) "ends the failed transaction")); appendPQExpBuffer(buf, " (try %u", st->tries); - /* Print max_tries if it is not unlimitted. */ + /* Print max_tries if it is not unlimited. */ if (max_tries) appendPQExpBuffer(buf, "/%u", max_tries); @@ -5303,7 +5303,7 @@ GetTableInfo(PGconn *con, bool scale_given) pg_log_error_hint("Perhaps you need to do initialization (\"pgbench -i\") in database \"%s\".", PQdb(con)); exit(1); } - else /* PQntupes(res) == 1 */ + else /* PQntuples(res) == 1 */ { /* normal case, extract partition information */ if (PQgetisnull(res, 0, 1)) diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index 50ae053f461..bb6d4f03151 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -1895,7 +1895,7 @@ table_relation_toast_am(Relation rel) * * toastrel is the relation in which the toasted value is stored. * - * valueid identifes which toast value is to be fetched. For the heap, + * valueid identifies which toast value is to be fetched. For the heap, * this corresponds to the values stored in the chunk_id column. * * attrsize is the total size of the toast value to be fetched. diff --git a/src/include/backup/basebackup_target.h b/src/include/backup/basebackup_target.h index bd2490282bb..250572f6dde 100644 --- a/src/include/backup/basebackup_target.h +++ b/src/include/backup/basebackup_target.h @@ -26,7 +26,7 @@ typedef struct BaseBackupTargetHandle BaseBackupTargetHandle; * and either throws an error (if the target detail is not valid or some other * problem, such as a permissions issue, is detected) or returns a pointer to * the data that will be needed to create a bbsink implementing that target. - * The second argumnt will be NULL if the TARGET_DETAIL option to the + * The second argument will be NULL if the TARGET_DETAIL option to the * BASE_BACKUP command was not specified. * * 'get_sink' is a function that creates the bbsink. The first argument diff --git a/src/include/replication/output_plugin.h b/src/include/replication/output_plugin.h index 2d89d26586e..3ac67293861 100644 --- a/src/include/replication/output_plugin.h +++ b/src/include/replication/output_plugin.h @@ -112,7 +112,7 @@ typedef bool (*LogicalDecodeFilterPrepareCB) (struct LogicalDecodingContext *ctx const char *gid); /* - * Callback called for every BEGIN of a prepared trnsaction. + * Callback called for every BEGIN of a prepared transaction. */ typedef void (*LogicalDecodeBeginPrepareCB) (struct LogicalDecodingContext *ctx, ReorderBufferTXN *txn); diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 1f306399594..c9fa84cc43c 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -321,7 +321,7 @@ tas(volatile slock_t *lock) /* * Solaris has always run sparc processors in TSO (total store) mode, but * linux didn't use to and the *BSDs still don't. So, be careful about - * acquire/release semantics. The CPU will treat superfluous membars as + * acquire/release semantics. The CPU will treat superfluous members as * NOPs, so it's just code space. */ #define HAS_TEST_AND_SET diff --git a/src/test/isolation/specs/serializable-parallel-3.spec b/src/test/isolation/specs/serializable-parallel-3.spec index c27298c24ff..858156c3ffe 100644 --- a/src/test/isolation/specs/serializable-parallel-3.spec +++ b/src/test/isolation/specs/serializable-parallel-3.spec @@ -1,6 +1,6 @@ # Exercise the case where a read-only serializable transaction has # SXACT_FLAG_RO_SAFE set in a parallel query. This variant is like -# two copies of #2 running at the same time, and excercises the case +# two copies of #2 running at the same time, and exercises the case # where another transaction has the same xmin, and it is the oldest. setup diff --git a/src/test/modules/unsafe_tests/expected/guc_privs.out b/src/test/modules/unsafe_tests/expected/guc_privs.out index 54f95b2334a..f43a1da214e 100644 --- a/src/test/modules/unsafe_tests/expected/guc_privs.out +++ b/src/test/modules/unsafe_tests/expected/guc_privs.out @@ -337,7 +337,7 @@ GRANT SET, ALTER SYSTEM ON PARAMETER autovacuum_work_mem, hash_mem_multiplier, max_stack_depth, shared_buffers, temp_file_limit, work_mem TO regress_host_resource_admin; --- Check the new role now has privilges on parameters +-- Check the new role now has privileges on parameters SELECT has_parameter_privilege('regress_host_resource_admin', 'work_mem', 'SET, ALTER SYSTEM'); has_parameter_privilege ------------------------- diff --git a/src/test/modules/unsafe_tests/sql/guc_privs.sql b/src/test/modules/unsafe_tests/sql/guc_privs.sql index 6c7733fc397..7a4fb24b9d1 100644 --- a/src/test/modules/unsafe_tests/sql/guc_privs.sql +++ b/src/test/modules/unsafe_tests/sql/guc_privs.sql @@ -133,7 +133,7 @@ GRANT SET, ALTER SYSTEM ON PARAMETER autovacuum_work_mem, hash_mem_multiplier, max_stack_depth, shared_buffers, temp_file_limit, work_mem TO regress_host_resource_admin; --- Check the new role now has privilges on parameters +-- Check the new role now has privileges on parameters SELECT has_parameter_privilege('regress_host_resource_admin', 'work_mem', 'SET, ALTER SYSTEM'); SELECT has_parameter_privilege('regress_host_resource_admin', 'work_mem', 'SET'); SELECT has_parameter_privilege('regress_host_resource_admin', 'work_mem', 'ALTER SYSTEM'); diff --git a/src/tools/pg_bsd_indent/tests/elsecomment.0 b/src/tools/pg_bsd_indent/tests/elsecomment.0 index 61066c22b58..c701f1b8a2c 100644 --- a/src/tools/pg_bsd_indent/tests/elsecomment.0 +++ b/src/tools/pg_bsd_indent/tests/elsecomment.0 @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /* See r303484 and r309342 */ void t(void) { - /* The two if statements below excercise two different code paths. */ + /* The two if statements below exercise two different code paths. */ if (1) /* a */ int a; else /* b */ int b; diff --git a/src/tools/pg_bsd_indent/tests/elsecomment.0.stdout b/src/tools/pg_bsd_indent/tests/elsecomment.0.stdout index 7de23be0894..6c3c10ea3d2 100644 --- a/src/tools/pg_bsd_indent/tests/elsecomment.0.stdout +++ b/src/tools/pg_bsd_indent/tests/elsecomment.0.stdout @@ -3,7 +3,7 @@ void t(void) { - /* The two if statements below excercise two different code paths. */ + /* The two if statements below exercise two different code paths. */ if (1) /* a */ int a;