mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos

Browse Source 
From: Alexander Law <exclusion@gmail.com>
This commit is contained in:
Peter Eisentraut 2016-08-16 12:00:00 -04:00
parent a3bce17ef1
commit f0fe1c8f70
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/sgml/release-9.6.sgml
View File

@ -1026,7 +1026,7 @@ This commit is also listed under libpq and psql
<para> <para>
This view exposes the same information available from This view exposes the same information available from
the the <application>pg_config</> comand-line utility, the <application>pg_config</> comand-line utility,
namely assorted compile-time configuration information for namely assorted compile-time configuration information for
<productname>PostgreSQL</>. <productname>PostgreSQL</>.
</para> </para>

2
doc/src/sgml/runtime.sgml
View File

@ -184,7 +184,7 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
</para> </para>
<para> <para>
Non-<literal>C</> and and non-<literal>POSIX</> locales rely on the Non-<literal>C</> and non-<literal>POSIX</> locales rely on the
operating system's collation library for character set ordering. operating system's collation library for character set ordering.
This controls the ordering of keys stored in indexes. For this reason, This controls the ordering of keys stored in indexes. For this reason,
a cluster cannot switch to an incompatible collation library version, a cluster cannot switch to an incompatible collation library version,

2
src/backend/access/transam/multixact.c
View File

@ -2802,7 +2802,7 @@ ReadMultiXactCounts(uint32 *multixacts, MultiXactOffset *members)
* more aggressive in clamping this value. That not only causes autovacuum * more aggressive in clamping this value. That not only causes autovacuum
* to ramp up, but also makes any manual vacuums the user issues more * to ramp up, but also makes any manual vacuums the user issues more
* aggressive. This happens because vacuum_set_xid_limits() clamps the * aggressive. This happens because vacuum_set_xid_limits() clamps the
* freeze table and and the minimum freeze age based on the effective * freeze table and the minimum freeze age based on the effective
* autovacuum_multixact_freeze_max_age this function returns. In the worst * autovacuum_multixact_freeze_max_age this function returns. In the worst
* case, we'll claim the freeze_max_age to zero, and every vacuum of any * case, we'll claim the freeze_max_age to zero, and every vacuum of any
* table will try to freeze every multixact. * table will try to freeze every multixact.

2
src/backend/utils/adt/tsquery.c
View File

@ -691,7 +691,7 @@ parse_tsquery(char *buf,
findoprnd(ptr, query->size, &needcleanup); findoprnd(ptr, query->size, &needcleanup);
/* /*
* QI_VALSTOP nodes should be cleaned and and OP_PHRASE should be pushed * QI_VALSTOP nodes should be cleaned and OP_PHRASE should be pushed
* down * down
*/ */
if (needcleanup) if (needcleanup)

2
src/test/regress/expected/privileges.out
View File

@ -390,7 +390,7 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- f
ERROR: permission denied for relation atest5 ERROR: permission denied for relation atest5
INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT) INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
ERROR: permission denied for relation atest5 ERROR: permission denied for relation atest5
-- Check that the the columns in the inference require select privileges -- Check that the columns in the inference require select privileges
-- Error. No privs on four -- Error. No privs on four
INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10; INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;
ERROR: permission denied for relation atest5 ERROR: permission denied for relation atest5

2
src/test/regress/sql/privileges.sql
View File

@ -259,7 +259,7 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLU
INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.three; INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.three;
INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- fails (due to UPDATE) INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- fails (due to UPDATE)
INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT) INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
-- Check that the the columns in the inference require select privileges -- Check that the columns in the inference require select privileges
-- Error. No privs on four -- Error. No privs on four
INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10; INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;