aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-05-19 14:40:02 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-05-19 14:40:02 -0400
commit16ea51a263bfbb009ba73f36494f49246933e93c (patch)
tree5a9f198bc2833ffd8e85ce2d0ec67f7d4dda3393 /src
parente13ac5586c49c77f301329b79bd7e8f489d0e66f (diff)
downloadpostgresql-16ea51a263bfbb009ba73f36494f49246933e93c.tar.gz
postgresql-16ea51a263bfbb009ba73f36494f49246933e93c.zip
Pin the built-in index access methods.
This was overlooked in commit 473b93287, which introduced DROP ACCESS METHOD. Although that command is restricted to superusers, we don't want even superusers dropping the built-in methods; "DROP ACCESS METHOD btree" in particular is unrecoverable from. Pin these objects in the same way that other initdb-created objects are pinned. I chose to bump catversion for this fix. That's not absolutely necessary perhaps, but it will ensure that no 9.6 production systems are missing the pin entries.
Diffstat (limited to 'src')
-rw-r--r--src/bin/initdb/initdb.c2
-rw-r--r--src/include/catalog/catversion.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index ec8c38ed5a4..d4a5e7c5eee 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1664,6 +1664,8 @@ setup_depend(FILE *cmdfd)
"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
" FROM pg_opfamily;\n\n",
"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+ " FROM pg_am;\n\n",
+ "INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
" FROM pg_amop;\n\n",
"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
" FROM pg_amproc;\n\n",
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 08867fb06a3..743e9a6e55d 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 201605051
+#define CATALOG_VERSION_NO 201605191
#endif