8000 Rebase to master - finished resolution of merge conflicts · gurjeet/postgres@0052d01 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0052d01

Browse files
gurjeetgurjeet
committed
Rebase to master - finished resolution of merge conflicts
1 parent c96756b commit 0052d01

File tree

11 files changed

+30
-4994
lines changed

11 files changed

+30
-4994
lines changed

‎src/backend/parser/gram.y

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
706706
DETACH DICTIONARY DISABLE_P DISCARD DISTINCT DO DOCUMENT_P DOMAIN_P
707707
DOUBLE_P DROP
708708

709-
<<<<<<< HEAD
710709
EACH ELSE ENABLE_P ENCODING ENCRYPTED END_P ENUM_P ESCAPE EVENT EXCEPT
711-
EXCLUDE EXCLUDING EXCLUSIVE EXECUTE EXISTS EXPLAIN EXPRESSION
712-
=======
713-
EACH ELSE EMPTY_P ENABLE_P ENCODING ENCRYPTED END_P ENUM_P ERROR_P ESCAPE
714-
EVENT EXCEPT EXCLUDE EXCLUDING EXCLUSIVE EXECUTE EXISTS EXPIRES EXPLAIN EXPRESSION
715-
>>>>>>> 9d551e8e76 (Patch v3)
710+
EXCLUDE EXCLUDING EXCLUSIVE EXECUTE EXISTS EXPIRES EXPLAIN EXPRESSION
716711
EXTENSION EXTERNAL EXTRACT
717712

718713
FALSE_P FAMILY FETCH FILTER FINALIZE FIRST_P FLOAT_P FOLLOWING FOR
@@ -748,13 +743,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
748743
ORDER ORDINALITY OTHERS OUT_P OUTER_P
749744
OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER
750745

751-
<<<<<<< HEAD
752-
PARALLEL PARAMETER PARSER PARTIAL PARTITION PASSING PASSWORD
753-
PLACING PLANS POLICY
754-
=======
755746
PARALLEL PARAMETER PARSER PARTIAL PARTITION PASSING PASSNAME PASSWORD
756-
PATH PLACING PLAN PLANS POLICY
757-
>>>>>>> 9d551e8e76 (Patch v3)
747+
PLACING PLANS POLICY
758748
POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
759749
PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROCEDURES PROGRAM PUBLICATION
760750

‎src/backend/utils/cache/syscache.c

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,24 +214,15 @@ static const struct cachedesc cacheinfo[] = {
214214
KEY(Anum_pg_authid_oid),
215215
8
216216
},
217-
<<<<<<< HEAD
218-
[CASTSOURCETARGET] = {
219-
CastRelationId,
220-
=======
221-
{AuthPasswordRelationId, /* AUTHPASSWORDNAME */
217+
[AUTHPASSWORDNAME] = {
218+
AuthPasswordRelationId,
222219
AuthPasswordRoleOidIndexId,
223-
2,
224-
{
225-
Anum_pg_auth_password_roleid,
226 89D7 -
Anum_pg_auth_password_name,
227-
0,
228-
0
229-
},
220+
KEY(Anum_pg_auth_password_roleid,
221+
Anum_pg_auth_password_name),
230222
8
231223
},
232-
{
233-
CastRelationId, /* CASTSOURCETARGET */
234-
>>>>>>> 9d551e8e76 (Patch v3)
224+
[CASTSOURCETARGET] = {
225+
CastRelationId,
235226
CastSourceTargetIndexId,
236227
KEY(Anum_pg_cast_castsource,
237228
Anum_pg_cast_casttarget),

0 commit comments

Comments
 (0)
0