aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2012-02-28 23:43:36 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2012-03-01 12:50:52 -0300
commit3433c6ba002f711a60352c3518f30cda73d06087 (patch)
tree644b2eb9cd1f6689a1e52b2f39c1cc6407db3965 /src
parenta5c1a1969dd838189e5cc936c15cb40e13fb6d68 (diff)
downloadpostgresql-3433c6ba002f711a60352c3518f30cda73d06087.tar.gz
postgresql-3433c6ba002f711a60352c3518f30cda73d06087.zip
Remove TOAST table from pg_database
The only toastable column now is datacl, but we don't really support long ACLs anyway. The TOAST table should have been removed when the pg_db_role_setting catalog was introduced in commit 2eda8dfb52ed9962920282d8384da8bb4c22514d, but I forgot to do that. Per -hackers discussion on March 2011.
Diffstat (limited to 'src')
-rw-r--r--src/backend/catalog/catalog.c4
-rw-r--r--src/include/catalog/catversion.h2
-rw-r--r--src/include/catalog/toasting.h3
3 files changed, 2 insertions, 7 deletions
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index c1f1db9a329..2547f33552e 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -402,9 +402,7 @@ IsSharedRelation(Oid relationId)
relationId == DbRoleSettingDatidRolidIndexId)
return true;
/* These are their toast tables and toast indexes (see toasting.h) */
- if (relationId == PgDatabaseToastTable ||
- relationId == PgDatabaseToastIndex ||
- relationId == PgShdescriptionToastTable ||
+ if (relationId == PgShdescriptionToastTable ||
relationId == PgShdescriptionToastIndex ||
relationId == PgDbRoleSettingToastTable ||
relationId == PgDbRoleSettingToastIndex)
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 8451dfde040..e5fbbfc8fda 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 201202271
+#define CATALOG_VERSION_NO 201203011
#endif
diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
index a4f1718a2d8..22211cbe3f3 100644
--- a/src/include/catalog/toasting.h
+++ b/src/include/catalog/toasting.h
@@ -50,9 +50,6 @@ DECLARE_TOAST(pg_statistic, 2840, 2841);
DECLARE_TOAST(pg_trigger, 2336, 2337);
/* shared catalogs */
-DECLARE_TOAST(pg_database, 2844, 2845);
-#define PgDatabaseToastTable 2844
-#define PgDatabaseToastIndex 2845
DECLARE_TOAST(pg_shdescription, 2846, 2847);
#define PgShdescriptionToastTable 2846
#define PgShdescriptionToastIndex 2847