NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc4826cf

committed

Merge the loading of shared object descriptions with regular descriptions,

both in code and in the messages emitted to the user.

1 parentaf00c04 commitc4826cfCopy full SHA for c4826cf

File tree

1 file changed

-35

lines changed

src/bin/initdb
- initdb.c

1 file changed

-35

lines changed

`‎src/bin/initdb/initdb.c`

Lines changed: 9 additions & 35 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.113 2006/03/05 15:58:50 momjian Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.114 2006/03/21 17:54:28 alvherre Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -178,7 +178,6 @@ static void unlimit_systables(void);`
`178`	`178`	`staticvoidsetup_depend(void);`
`179`	`179`	`staticvoidsetup_sysviews(void);`
`180`	`180`	`staticvoidsetup_description(void);`
`181`		`-staticvoidsetup_shared_description(void);`
`182`	`181`	`staticvoidsetup_conversion(void);`
`183`	`182`	`staticvoidsetup_privileges(void);`
`184`	`183`	`staticvoidset_info_version(void);`
`@@ -1725,7 +1724,7 @@ setup_description(void)`
`1725`	`1724`	`{`
`1726`	`1725`	`PG_CMD_DECL;`
`1727`	`1726`
`1728`		`-fputs(_("loadingpg_description ... "),stdout);`
	`1727`	`+fputs(_("loadingsystem objects' descriptions ... "),stdout);`
`1729`	`1728`	`fflush(stdout);`
`1730`	`1729`
`1731`	`1730`	`snprintf(cmd,sizeof(cmd),`
`@@ -1749,41 +1748,18 @@ setup_description(void)`
`1749`	`1748`	`" FROM tmp_pg_description t, pg_class c "`
`1750`	`1749`	`" WHERE c.relname = t.classname;\n");`
`1751`	`1750`
`1752`		`-PG_CMD_CLOSE;`
`1753`		`-`
`1754`		`-check_ok();`
`1755`		`-}`
`1756`		`-`
`1757`		`-/*`
`1758`		`- * load shared description data`
`1759`		`- */`
`1760`		`-staticvoid`
`1761`		`-setup_shared_description(void)`
`1762`		`-{`
`1763`		`-PG_CMD_DECL;`
`1764`		`-`
`1765`		`-fputs(_("loading pg_shdescription ... "),stdout);`
`1766`		`-fflush(stdout);`
`1767`		`-`
`1768`		`-snprintf(cmd,sizeof(cmd),`
`1769`		`-"\"%s\" %s template1 >%s",`
`1770`		`-backend_exec,backend_options,`
`1771`		`-DEVNULL);`
`1772`		`-`
`1773`		`-PG_CMD_OPEN;`
`1774`		`-`
`1775`	`1751`	`PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_shdescription ( "`
`1776`		`-" objoid oid, "`
`1777`		`-" classname name, "`
`1778`		`-" description text) WITHOUT OIDS;\n");`
	`1752`	`+" objoid oid, "`
	`1753`	`+" classname name, "`
	`1754`	`+" description text) WITHOUT OIDS;\n");`
`1779`	`1755`
`1780`	`1756`	`PG_CMD_PRINTF1("COPY tmp_pg_shdescription FROM '%s';\n",`
`1781`		`-shdesc_file);`
	`1757`	`+shdesc_file);`
`1782`	`1758`
`1783`	`1759`	`PG_CMD_PUTS("INSERT INTO pg_shdescription "`
`1784`		`-" SELECT t.objoid, c.oid, t.description "`
`1785`		`-" FROM tmp_pg_shdescription t, pg_class c "`
`1786`		`-" WHERE c.relname = t.classname;\n");`
	`1760`	`+" SELECT t.objoid, c.oid, t.description "`
	`1761`	`+" FROM tmp_pg_shdescription t, pg_class c "`
	`1762`	`+" WHERE c.relname = t.classname;\n");`
`1787`	`1763`
`1788`	`1764`	`PG_CMD_CLOSE;`
`1789`	`1765`
`@@ -2960,8 +2936,6 @@ main(int argc, char *argv[])`
`2960`	`2936`
`2961`	`2937`	`setup_description();`
`2962`	`2938`
`2963`		`-setup_shared_description();`
`2964`		`-`
`2965`	`2939`	`setup_conversion();`
`2966`	`2940`
`2967`	`2941`	`setup_privileges();`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc4826cf

File tree

1 file changed

1 file changed

`‎src/bin/initdb/initdb.c`

0 commit comments