Rename vacuum_cost_limit switch from -N to -l to avoid conflict with

existing Windows-only switch.

diff --git a/contrib/pg_autovacuum/README.pg_autovacuum b/contrib/pg_autovacuum/README.pg_autovacuum
index 693848ceaa23f30280c610fea1c2c26064ef5109..88a8997b164cb06f975c038d370d8757813c647b 100644 (file)
--- a/contrib/pg_autovacuum/README.pg_autovacuum
+++ b/contrib/pg_autovacuum/README.pg_autovacuum
@@ -141,7 +141,7 @@ will be used.
 -C     vacuum_cost_page_hit
 -m     vacuum_cost_page_miss
 -n     vacuum_cost_page_dirty
--N     vacuum_cost_limit
+-l     vacuum_cost_limit
 
 
 Numerous arguments have default values defined in pg_autovacuum.h.  At

diff --git a/contrib/pg_autovacuum/pg_autovacuum.c b/contrib/pg_autovacuum/pg_autovacuum.c
index 953404555ad4a767c5c7fd900f1ddcbe490439cf..fe1809ec11c83e81854e137ad8574118f886899f 100644 (file)
--- a/contrib/pg_autovacuum/pg_autovacuum.c
+++ b/contrib/pg_autovacuum/pg_autovacuum.c
@@ -4,7 +4,7 @@
  * Revisions by Christopher B. Browne, Liberty RMS
  * Win32 Service code added by Dave Page
  *
- * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.24 2004/11/17 16:54:15 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.25 2004/11/17 21:30:36 tgl Exp $
  */
 
 #include "postgres_fe.h"
@@ -1098,9 +1098,9 @@ get_cmd_args(int argc, char *argv[])
         * values etc
         */
 #ifndef WIN32
-       while ((c = getopt(argc, argv, "s:S:v:V:a:A:d:U:P:H:L:p:hD:c:C:m:n:N:")) != -1)
+       while ((c = getopt(argc, argv, "s:S:v:V:a:A:d:U:P:H:L:p:hD:c:C:m:n:l:")) != -1)
 #else
-       while ((c = getopt(argc, argv, "s:S:v:V:a:A:d:U:P:H:L:p:hIRN:W:c:C:m:n:N:")) != -1)
+       while ((c = getopt(argc, argv, "s:S:v:V:a:A:d:U:P:H:L:p:hIRN:W:c:C:m:n:l:")) != -1)
 #endif
        {
                switch (c)
@@ -1135,7 +1135,7 @@ get_cmd_args(int argc, char *argv[])
                        case 'n':
                                args->av_vacuum_cost_page_dirty = atoi(optarg);
                                break;
-                       case 'N':
+                       case 'l':
                                args->av_vacuum_cost_limit = atoi(optarg);
                                break;
 #ifndef WIN32
@@ -1240,7 +1240,7 @@ usage(void)
        fprintf(stderr, "   [-C] vacuum_cost_page_hit (default=none)\n");
        fprintf(stderr, "   [-m] vacuum_cost_page_miss (default=none)\n");
        fprintf(stderr, "   [-n] vacuum_cost_page_dirty (default=none)\n");
-       fprintf(stderr, "   [-N] vacuum_cost_limit (default=none)\n");
+       fprintf(stderr, "   [-l] vacuum_cost_limit (default=none)\n");
        
        fprintf(stderr, "   [-U] username (libpq default)\n");
        fprintf(stderr, "   [-P] password (libpq default)\n");