mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless database name from bootstrap argument processing (including

Browse Source 
startup and bgwriter processes), and the -y flag.  It's not used anywhere.
This commit is contained in:
Alvaro Herrera 2007-02-16 02:10:07 +00:00
parent 6bef118b01
commit 68046a20c7
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/src/sgml/ref/postgres-ref.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.49 2007/01/31 23:26:04 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.50 2007/02/16 02:10:07 alvherre Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -475,17 +475,6 @@ PostgreSQL documentation
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>-y</option> <replaceable class="parameter">database</replaceable></term>
<listitem>
<para>
Indicates that this is a subprocess started by a parent
<command>postgres</command> process, and specifies the database to
use. This option is for internal use only.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect2> </refsect2>

18
src/backend/bootstrap/bootstrap.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.231 2007/02/15 23:23:22 alvherre Exp $ * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.232 2007/02/16 02:10:07 alvherre Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -208,7 +208,6 @@ BootstrapMain(int argc, char *argv[])
{ {
char *progname = argv[0]; char *progname = argv[0];
int i; int i;
char *dbname;
int flag; int flag;
int xlogop = BS_XLOG_NOP; int xlogop = BS_XLOG_NOP;
char *userDoption = NULL; char *userDoption = NULL;
@ -239,7 +238,6 @@ BootstrapMain(int argc, char *argv[])
*/ */
/* Set defaults, to be overriden by explicit options below */ /* Set defaults, to be overriden by explicit options below */
dbname = NULL;
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
InitializeGUCOptions(); InitializeGUCOptions();
@ -250,7 +248,7 @@ BootstrapMain(int argc, char *argv[])
argc--; argc--;
} }
while ((flag = getopt(argc, argv, "B:c:d:D:Fr:x:y:-:")) != -1) while ((flag = getopt(argc, argv, "B:c:d:D:Fr:x:-:")) != -1)
{ {
switch (flag) switch (flag)
{ {
@ -282,9 +280,6 @@ BootstrapMain(int argc, char *argv[])
case 'x': case 'x':
xlogop = atoi(optarg); xlogop = atoi(optarg);
break; break;
case 'y':
dbname = strdup(optarg);
break;
case 'c': case 'c':
case '-': case '-':
{ {
@ -320,12 +315,7 @@ BootstrapMain(int argc, char *argv[])
} }
} }
if (!dbname && argc - optind == 1) if (argc != optind)
{
dbname = argv[optind];
optind++;
}
if (!dbname || argc != optind)
{ {
write_stderr("%s: invalid command-line arguments\n", progname); write_stderr("%s: invalid command-line arguments\n", progname);
proc_exit(1); proc_exit(1);
@ -449,7 +439,7 @@ BootstrapMain(int argc, char *argv[])
* Do backend-like initialization for bootstrap mode * Do backend-like initialization for bootstrap mode
*/ */
InitProcess(); InitProcess();
(void) InitPostgres(dbname, InvalidOid, NULL, NULL); (void) InitPostgres(NULL, InvalidOid, NULL, NULL);
/* /*
* In NOP mode, all we really want to do is create shared memory and * In NOP mode, all we really want to do is create shared memory and

5
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.522 2007/02/15 23:23:23 alvherre Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.523 2007/02/16 02:10:07 alvherre Exp $
* *
* NOTES * NOTES
* *
@ -3729,9 +3729,6 @@ StartChildProcess(int xlop)
snprintf(xlbuf, sizeof(xlbuf), "-x%d", xlop); snprintf(xlbuf, sizeof(xlbuf), "-x%d", xlop);
av[ac++] = xlbuf; av[ac++] = xlbuf;
av[ac++] = "-y";
av[ac++] = "template1";
av[ac] = NULL; av[ac] = NULL;
Assert(ac < lengthof(av)); Assert(ac < lengthof(av));

8
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.132 2007/02/10 14:58:55 petere Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.133 2007/02/16 02:10:07 alvherre Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1186,7 +1186,7 @@ test_config_settings(void)
"-c max_connections=%d " "-c max_connections=%d "
"-c shared_buffers=%d " "-c shared_buffers=%d "
"-c max_fsm_pages=%d " "-c max_fsm_pages=%d "
"template1 < \"%s\" > \"%s\" 2>&1%s", "< \"%s\" > \"%s\" 2>&1%s",
SYSTEMQUOTE, backend_exec, boot_options, SYSTEMQUOTE, backend_exec, boot_options,
test_conns, test_buffs, test_max_fsm, test_conns, test_buffs, test_max_fsm,
DEVNULL, DEVNULL, SYSTEMQUOTE); DEVNULL, DEVNULL, SYSTEMQUOTE);
@ -1221,7 +1221,7 @@ test_config_settings(void)
"-c max_connections=%d " "-c max_connections=%d "
"-c shared_buffers=%d " "-c shared_buffers=%d "
"-c max_fsm_pages=%d " "-c max_fsm_pages=%d "
"template1 < \"%s\" > \"%s\" 2>&1%s", "< \"%s\" > \"%s\" 2>&1%s",
SYSTEMQUOTE, backend_exec, boot_options, SYSTEMQUOTE, backend_exec, boot_options,
n_connections, test_buffs, test_max_fsm, n_connections, test_buffs, test_max_fsm,
DEVNULL, DEVNULL, SYSTEMQUOTE); DEVNULL, DEVNULL, SYSTEMQUOTE);
@ -1455,7 +1455,7 @@ bootstrap_template1(char *short_version)
unsetenv("PGCLIENTENCODING"); unsetenv("PGCLIENTENCODING");
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"\"%s\" --boot -x1 %s %s template1", "\"%s\" --boot -x1 %s %s",
backend_exec, boot_options, talkargs); backend_exec, boot_options, talkargs);
PG_CMD_OPEN; PG_CMD_OPEN;