Fix bug introduced by pgrminclude where the tablespace version name was

not expanded.

Bump catalog version number to force initdb for all tablespaces.

diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 1e1e12d36dea5533c6ff90d2cd3477c04d52261c..e472e050692a4f7a268d01292b2c1d66bd777709 100644 (file)
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -14,6 +14,11 @@
 #ifndef CATALOG_H
 #define CATALOG_H
 
+/*
+ * 'pgrminclude ignore' needed here because CppAsString2() does not throw
+ * an error if the symbol is not defined.
+ */
+#include "catalog/catversion.h"    /* pgrminclude ignore */
 #include "catalog/pg_class.h"
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index f5c9797c60856d27cf9cb834545ccca4466c0c4b..f3c8bb414222971ef34d0e661a85076c9137eec3 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 201108051
+#define CATALOG_VERSION_NO 201109071
 
 #endif