Commit51aa9d2

committed

resolve conflicts

2 parents087abe7 +91005d0 commit51aa9d2Copy full SHA for 51aa9d2

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -826,6 +826,18 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,`
`826`	`826`	`#endif`
`827`	`827`
`828`	`828`
	`829`	`+/*`
	`830`	`+ * HeapTupleGetXmin()`
	`831`	`+ * Vanilla PostgreSQL has HeaptTupleHeaderGetXmin, but for 64-bit xid`
	`832`	`+ * we need access to entire tuple, not just its header.`
	`833`	`+ */`
	`834`	`+#ifdefXID_IS_64BIT`
	`835`	`+# defineHeapTupleGetXminCompat(htup) HeapTupleGetXmin(htup)`
	`836`	`+#else`
	`837`	`+# defineHeapTupleGetXminCompat(htup) HeapTupleHeaderGetXmin((htup)->t_data)`
	`838`	`+#endif`
	`839`	`+`
	`840`	`+`
`829`	`841`	`/*`
`830`	`842`	`* -------------`
`831`	`843`	`* Common code`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ pathman_config_contains_relation(Oid relid, Datum values, bool isnull,`
`657`	`657`
`658`	`658`	`/* Set xmin if necessary */`
`659`	`659`	`if (xmin)`
`660`		`-*xmin=HeapTupleHeaderGetXmin(htup->t_data);`
	`660`	`+*xmin=HeapTupleGetXminCompat(htup);`
`661`	`661`
`662`	`662`	`/* Set ItemPointer if necessary */`
`663`	`663`	`if (iptr)`

Comments

(0)