summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorTom Lane2004-02-03 17:34:04 +0000
committerTom Lane2004-02-03 17:34:04 +0000
commit391c3811a2b7f4cd666e1b4f35534046a862abbb (patch)
tree16e534067f9cb86d99b598675fbf3929589e6629 /src/bin
parent39d715bee6f1eb1e7b90148368a22fe24f008185 (diff)
Rename SortMem and VacuumMem to work_mem and maintenance_work_mem.
Make btree index creation and initial validation of foreign-key constraints use maintenance_work_mem rather than work_mem as their memory limit. Add some code to guc.c to allow these variables to be referenced by their old names in SHOW and SET commands, for backwards compatibility.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/psql/tab-complete.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 68bd8391970..bea56852e43 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.100 2004/01/25 03:07:22 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.101 2004/02/03 17:34:03 tgl Exp $
*/
/*----------------------------------------------------------------------
@@ -533,6 +533,7 @@ psql_completion(char *text, int start, int end)
"log_planner_stats",
"log_statement",
"log_statement_stats",
+ "maintenance_work_mem",
"max_connections",
"max_expr_depth",
"max_files_per_process",
@@ -547,7 +548,6 @@ psql_completion(char *text, int start, int end)
"shared_buffers",
"seed",
"server_encoding",
- "sort_mem",
"sql_inheritance",
"ssl",
"statement_timeout",
@@ -567,10 +567,10 @@ psql_completion(char *text, int start, int end)
"unix_socket_directory",
"unix_socket_group",
"unix_socket_permissions",
- "vacuum_mem",
"wal_buffers",
"wal_debug",
"wal_sync_method",
+ "work_mem",
NULL
};