aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-09-07 12:41:16 -0400
committerBruce Momjian <bruce@momjian.us>2011-09-07 12:41:16 -0400
commitf81fb4f690355bc88fee69624103956fb4576fe5 (patch)
treeff9f69f93583bcce44df2df425c8d6ece0600ed7 /src
parent029dfdf1157b6d837a7b7211cd35b00c6bcd767c (diff)
downloadpostgresql-f81fb4f690355bc88fee69624103956fb4576fe5.tar.gz
postgresql-f81fb4f690355bc88fee69624103956fb4576fe5.zip
Fix bug introduced by pgrminclude where the tablespace version name was
not expanded. Bump catalog version number to force initdb for all tablespaces.
Diffstat (limited to 'src')
-rw-r--r--src/include/catalog/catalog.h5
-rw-r--r--src/include/catalog/catversion.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 1e1e12d36de..e472e050692 100644
--- 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 f5c9797c608..f3c8bb41422 100644
--- 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