Merge branch 'master' into stable

Author: pashkinelfe

.travis.yml

@@ -1,4 +1,6 @@
-sudo: required
+os: linux
+
+dist: bionic
 
 language: c
 
@@ -21,6 +23,8 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=15beta1
+    - PG_VERSION=15beta1 LEVEL=hardcore
     - PG_VERSION=14
     - PG_VERSION=14 LEVEL=hardcore
     - PG_VERSION=13

src/disable_core_macro.h

@@ -16,9 +16,18 @@
 #undef TRACE_POSTGRESQL_SORT_START
 #undef TRACE_POSTGRESQL_SORT_DONE
 
+#if PG_VERSION_NUM >= 110000
 #define TRACE_POSTGRESQL_SORT_START(arg1, arg2, arg3, arg4, arg5, arg6) \
 			do {} while(0)
+#else
+#define TRACE_POSTGRESQL_SORT_START(arg1, arg2, arg3, arg4, arg5) \
+			do {} while(0)
+#endif
+
+
 #define TRACE_POSTGRESQL_SORT_DONE(arg1, arg2) \
 			do {} while(0)
 
+
+
 #endif /* __DISABLE_CORE_MACRO_H__ */