diff --git a/repmgr.c b/repmgr.c index f3aae632..6851f6af 100644 --- a/repmgr.c +++ b/repmgr.c @@ -889,19 +889,10 @@ do_standby_clone(void) check_master_config(conn, true); - /* - * Check if the tablespace locations exists and that we can write to them. - */ - if (master_version_num < 90200) - sqlquery_snprintf(sqlquery, - "SELECT spclocation " - " FROM pg_tablespace " - "WHERE spcname NOT IN ('pg_default', 'pg_global')"); - else - sqlquery_snprintf(sqlquery, - "SELECT pg_tablespace_location(oid) spclocation " - " FROM pg_tablespace " - "WHERE spcname NOT IN ('pg_default', 'pg_global')"); + sqlquery_snprintf(sqlquery, + "SELECT pg_tablespace_location(oid) spclocation " + " FROM pg_tablespace " + "WHERE spcname NOT IN ('pg_default', 'pg_global')"); log_debug("standby clone: %s\n", sqlquery); diff --git a/repmgrd.c b/repmgrd.c index db30ab6f..a8080210 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -48,7 +48,7 @@ const XLogRecPtr InvalidXLogRecPtr = {0, 0}; #endif -#if PG_VERSION_NUM >= 90300 + #define XLAssign(a, b) \ a = b @@ -57,15 +57,7 @@ const XLogRecPtr InvalidXLogRecPtr = {0, 0}; #define XLByteLT(a, b) \ (a < b) -#else -#define XLAssign(a, b) \ - a.xlogid = b.xlogid; \ - a.xrecoff = b.xrecoff -#define XLAssignValue(a, uxlogid, uxrecoff) \ - a.xlogid = uxlogid; \ - a.xrecoff = uxrecoff -#endif /*