Revert "Modified files for MERGE"

Simon Riggs <simon@2ndQuadrant.com>

Commit: 7cf8a5c302735d193dcf901b87e03e324903c632
Author: Simon Riggs <simon@2ndQuadrant.com>
Date: 2018-04-02T20:34:15Z
Releases: 11.0
Revert "Modified files for MERGE"

This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.

Files

PathChange+/−
contrib/test_decoding/expected/ddl.out modified +0 −46
contrib/test_decoding/sql/ddl.sql modified +0 −16
doc/src/sgml/libpq.sgml modified +3 −5
doc/src/sgml/mvcc.sgml modified +1 −27
doc/src/sgml/plpgsql.sgml modified +1 −2
doc/src/sgml/ref/allfiles.sgml modified +0 −1
doc/src/sgml/ref/create_policy.sgml modified +0 −7
doc/src/sgml/reference.sgml modified +0 −1
doc/src/sgml/ref/insert.sgml modified +1 −10
doc/src/sgml/trigger.sgml modified +0 −20
src/backend/access/heap/heapam.c modified +12 −16
src/backend/catalog/sql_features.txt modified +3 −3
src/backend/commands/explain.c modified +0 −33
src/backend/commands/prepare.c modified +0 −1
src/backend/commands/trigger.c modified +35 −121
src/backend/executor/execMain.c modified +0 −17
src/backend/executor/execPartition.c modified +0 −116
src/backend/executor/execReplication.c modified +2 −2
src/backend/executor/Makefile modified +1 −1
src/backend/executor/nodeModifyTable.c modified +45 −339
src/backend/executor/README modified +0 −10
src/backend/executor/spi.c modified +0 −3
src/backend/nodes/copyfuncs.c modified +0 −40
src/backend/nodes/equalfuncs.c modified +0 −32
src/backend/nodes/nodeFuncs.c modified +3 −45
src/backend/nodes/outfuncs.c modified +0 −25
src/backend/nodes/readfuncs.c modified +0 −6
src/backend/optimizer/plan/createplan.c modified +4 −18
src/backend/optimizer/plan/planner.c modified +2 −27
src/backend/optimizer/plan/setrefs.c modified +0 −54
src/backend/optimizer/prep/preptlist.c modified +0 −41
src/backend/optimizer/util/pathnode.c modified +2 −9
src/backend/optimizer/util/plancat.c modified +0 −4
src/backend/parser/analyze.c modified +8 −10
src/backend/parser/gram.y modified +1 −157
src/backend/parser/Makefile modified +1 −1
src/backend/parser/parse_agg.c modified +0 −10
src/backend/parser/parse_clause.c modified +5 −40
src/backend/parser/parse_collate.c modified +0 −1
src/backend/parser/parse_expr.c modified +0 −3
src/backend/parser/parse_func.c modified +0 −3
src/backend/parser/parse_relation.c modified +0 −10
src/backend/rewrite/rewriteHandler.c modified +7 −110
src/backend/rewrite/rowsecurity.c modified +0 −97
src/backend/tcop/pquery.c modified +0 −5
src/backend/tcop/utility.c modified +0 −16
src/include/access/heapam.h modified +1 −12
src/include/commands/trigger.h modified +2 −4
src/include/executor/execPartition.h modified +0 −1
src/include/executor/instrument.h modified +2 −5
src/include/executor/nodeModifyTable.h modified +0 −21
src/include/executor/spi.h modified +0 −1
src/include/nodes/execnodes.h modified +1 −64
src/include/nodes/nodes.h modified +1 −5
src/include/nodes/parsenodes.h modified +4 −33
src/include/nodes/plannodes.h modified +2 −6
src/include/nodes/relation.h modified +2 −5
src/include/optimizer/pathnode.h modified +2 −5
src/include/parser/analyze.h modified +0 −5
src/include/parser/kwlist.h modified +0 −2
src/include/parser/parse_clause.h modified +1 −4
src/include/parser/parse_node.h modified +2 −3
src/include/rewrite/rewriteHandler.h modified +0 −1
src/interfaces/libpq/fe-exec.c modified +4 −5
src/pl/plpgsql/src/pl_exec.c modified +1 −4
src/pl/plpgsql/src/pl_gram.y modified +0 −8
src/pl/plpgsql/src/plpgsql.h modified +2 −2
src/pl/plpgsql/src/pl_scanner.c modified +0 −1
src/test/isolation/isolation_schedule modified +0 −4
src/test/regress/expected/identity.out modified +0 −55
src/test/regress/expected/privileges.out modified +0 −98
src/test/regress/expected/rowsecurity.out modified +0 −182
src/test/regress/expected/rules.out modified +0 −31
src/test/regress/expected/triggers.out modified +0 −48
src/test/regress/parallel_schedule modified +1 −1
src/test/regress/serial_schedule modified +0 −1
src/test/regress/sql/identity.sql modified +0 −45
src/test/regress/sql/privileges.sql modified +0 −108
src/test/regress/sql/rowsecurity.sql modified +0 −156
src/test/regress/sql/rules.sql modified +0 −33
src/test/regress/sql/triggers.sql modified +0 −47
src/tools/pgindent/typedefs.list modified +0 −3

Documentation touched