Remove line duplicated during conflict resolution.

Re-add default_with_oids GUC to avoid breaking old dump files.

Mark pg_config() stable rather than immutable

Ensure consistent sort order of large objects in pg_dump.

Fix ac218aa4f6 to work on versions before 9.5.

Update pg_upgrade test for reg* to include regrole and regnamespace.

Make TupleTableSlots extensible, finish split of existing slot type.

Inline hot path of slot_getsomeattrs().

Compute information about EEOP_*_FETCHSOME at expression init time.

Introduce notion of different types of slots (without implementing them).

Don't generate tuple deforming functions for virtual slots.