git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml

index 285da158b5d23ad155b725eebc5ae4e69e469a6a..e67042b1622c53c25de9b02048f6009986ba57f9 100644 (file)

--- a/doc/src/sgml/ref/postgres-ref.sgml

+++ b/doc/src/sgml/ref/postgres-ref.sgml

<!--

-$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

-->

</para>

</listitem>

</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>

</refsect2>

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c

index 6e6efe744ba77e37fac49b182ec7f2ae74b32c1d..d9a486f77156b4cd8a61b084bbdf82b2c8fc4d51 100644 (file)

--- a/src/backend/bootstrap/bootstrap.c

+++ b/src/backend/bootstrap/bootstrap.c

* Portions Copyright (c) 1994, Regents of the University of California

*

* 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 $

*

*-------------------------------------------------------------------------

*/

{

char *progname = argv[0];

int i;

- char *dbname;

int flag;

int xlogop = BS_XLOG_NOP;

char *userDoption = NULL;

*/

/* Set defaults, to be overriden by explicit options below */

- dbname = NULL;

if (!IsUnderPostmaster)

InitializeGUCOptions();

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)

{

case 'x':

xlogop = atoi(optarg);

break;

- case 'y':

- dbname = strdup(optarg);

- break;

case 'c':

case '-':

{

}

}

- if (!dbname && argc - optind == 1)

- {

- dbname = argv[optind];

- optind++;

- }

- if (!dbname || argc != optind)

+ if (argc != optind)

{

write_stderr("%s: invalid command-line arguments\n", progname);

proc_exit(1);

* Do backend-like initialization for bootstrap mode

*/

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

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c

index 1917cd4185f79893afd90dcf83ed3cc5f849deac..f7411210a74c0e6dfb8e4eeeb6918a266bd16a53 100644 (file)

--- a/src/backend/postmaster/postmaster.c

+++ b/src/backend/postmaster/postmaster.c

*

*

* 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

*

snprintf(xlbuf, sizeof(xlbuf), "-x%d", xlop);

av[ac++] = xlbuf;

- av[ac++] = "-y";

- av[ac++] = "template1";

-

av[ac] = NULL;

Assert(ac < lengthof(av));

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c

index 5b559aecc95645110946fd122d02117f7f341efa..3001e325b2a80c91a979a0feac97263bb748c3d8 100644 (file)

--- a/src/bin/initdb/initdb.c

+++ b/src/bin/initdb/initdb.c

* Portions Copyright (c) 1994, Regents of the University of California

* 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 $

*

*-------------------------------------------------------------------------

*/

"-c max_connections=%d "

"-c shared_buffers=%d "

"-c max_fsm_pages=%d "

- "template1 < \"%s\" > \"%s\" 2>&1%s",

+ "< \"%s\" > \"%s\" 2>&1%s",

SYSTEMQUOTE, backend_exec, boot_options,

test_conns, test_buffs, test_max_fsm,

DEVNULL, DEVNULL, SYSTEMQUOTE);

"-c max_connections=%d "

"-c shared_buffers=%d "

"-c max_fsm_pages=%d "

- "template1 < \"%s\" > \"%s\" 2>&1%s",

+ "< \"%s\" > \"%s\" 2>&1%s",

SYSTEMQUOTE, backend_exec, boot_options,

n_connections, test_buffs, test_max_fsm,

DEVNULL, DEVNULL, SYSTEMQUOTE);

unsetenv("PGCLIENTENCODING");

snprintf(cmd, sizeof(cmd),

- "\"%s\" --boot -x1 %s %s template1",

+ "\"%s\" --boot -x1 %s %s",

backend_exec, boot_options, talkargs);

PG_CMD_OPEN;