postgres.git / summary / log / commit / refs

commit    f81fb4f690355bc88fee69624103956fb4576fe5
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Sep 07 16:41:16 2011 +0000
First released in: 9.2.0

    Fix bug introduced by pgrminclude where the tablespace version name was
    not expanded.
    
    Bump catalog version number to force initdb for all tablespaces.


 src/include/catalog/catalog.h    | 5 +++++
 src/include/catalog/catversion.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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


[parent: 029dfdf1157b]