Commitedc46b6

Maxim Orlov

committed

Merge branch 'master' into stable

2 parents1d1bfe2 +13a77d5 commitedc46b6Copy full SHA for edc46b6

File tree

+17

-3

lines changed

+17

-3

lines changed

100755100644

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2106,8 +2106,11 @@ static void`
`2106`	`2106`	`compatibility_check(void)`
`2107`	`2107`	`{`
`2108`	`2108`	`#ifdefPGPRO_EE`
`2109`		`-if (getNestLevelATX()!=0)`
`2110`		`-elog(ERROR,"pg_variable extension is not compatible with autonomous transactions and connection pooling");`
	`2109`	`+#if (PG_VERSION_NUM<130000)\|\| \`
	`2110`	`+((PG_VERSION_NUM >=130000)&& (definedPGPRO_FEATURE_ATX))`
	`2111`	`+if (getNestLevelATX()!=0)`
	`2112`	`+elog(ERROR,"pg_variable extension is not compatible with autonomous transactions and connection pooling");`
	`2113`	`+#endif`
`2111`	`2114`	`#endif`
`2112`	`2115`	`}`
`2113`	`2116`

100755100644

File mode changed.

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,18 @@`
`11`	`11`	`#include"funcapi.h"`
`12`	`12`
`13`	`13`	`#include"access/htup_details.h"`
`14`		`-#include"access/tuptoaster.h"`
	`14`	`+/*`
	`15`	`+ * See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=8b94dab06617ef80a0901ab103ebd8754427ef`
	`16`	`+ *`
	`17`	`+ * Split tuptoaster.c into three separate files.`
	`18`	`+ */`
	`19`	`+#ifPG_VERSION_NUM >=130000`
	`20`	`+#include"access/detoast.h"`
	`21`	`+#include"access/heaptoast.h"`
	`22`	`+#else`
	`23`	`+#include"access/tuptoaster.h"`
	`24`	`+#endif`
	`25`	`+`
`15`	`26`	`#include"catalog/pg_collation.h"`
`16`	`27`	`#include"catalog/pg_type.h"`
`17`	`28`	`#include"utils/builtins.h"`

Comments

(0)