NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7515bb4

committed

Fix for psql pager when no tty, cleanup for vacuum attdisbursion type.

1 parent5f7f236 commit7515bb4Copy full SHA for 7515bb4

File tree

2 files changed

-7

lines changed

src
- backend/commands
  - vacuum.c
- bin/psql
  - psql.c

2 files changed

-7

lines changed

`‎src/backend/commands/vacuum.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.41 1997/08/21 03:01:36 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.42 1997/08/22 04:13:08 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1769,7 +1769,7 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst`
`1769`	`1769`	`while (HeapTupleIsValid(atup=heap_getnext(asdesc,0,&abuf)))`
`1770`	`1770`	`{`
`1771`	`1771`	`inti;`
`1772`		`-doubleselratio;/* average ratio of rows selected for a random constant */`
	`1772`	`+float32dataselratio;/* average ratio of rows selected for a random constant */`
`1773`	`1773`	`VacAttrStats*stats;`
`1774`	`1774`	`Datumvalues[Natts_pg_statistic ];`
`1775`	`1775`	`charnulls[Natts_pg_statistic ];`

`‎src/bin/psql/psql.c‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.85 1997/08/2200:17:26 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.86 1997/08/2204:13:18 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -157,7 +157,7 @@ slashUsage(PsqlSettings * ps)`
`157`	`157`	`char*pagerenv;`
`158`	`158`	`FILE*fout;`
`159`	`159`
`160`		`-if (settings.notty==0&&`
	`160`	`+if (ps->notty==0&&`
`161`	`161`	`(pagerenv=getenv("PAGER"))&&`
`162`	`162`	`(pagerenv[0]!='\0')&&`
`163`	`163`	`(fout=popen(pagerenv,"w")))`
`@@ -1008,7 +1008,7 @@ do_edit(const char filename_arg, char query, int *status_p)`
`1008`	`1008`
`1009`	`1009`
`1010`	`1010`	`staticvoid`
`1011`		`-do_help(constchar*topic)`
	`1011`	`+do_help(PsqlSettingsps,constchartopic)`
`1012`	`1012`	`{`
`1013`	`1013`
`1014`	`1014`	`if (!topic) {`
`@@ -1049,7 +1049,7 @@ do_help(const char *topic)`
`1049`	`1049`	`FILE*fout;`
`1050`	`1050`
`1051`	`1051`	`if (strcmp(topic,"*")==0&&`
`1052`		`- (settings.notty==0)&&`
	`1052`	`+ (ps->notty==0)&&`
`1053`	`1053`	`(pagerenv=getenv("PAGER"))&&`
`1054`	`1054`	`(pagerenv[0]!='\0')&&`
`1055`	`1055`	`(fout=popen(pagerenv,"w")))`
`@@ -1310,7 +1310,7 @@ HandleSlashCmds(PsqlSettings * settings,`
`1310`	`1310`	`break;`
`1311`	`1311`	`case'h':/* help */`
`1312`	`1312`	`{`
`1313`		`-do_help(optarg);`
	`1313`	`+do_help(settings,optarg);`
`1314`	`1314`	`break;`
`1315`	`1315`	`}`
`1316`	`1316`	`case'i':/* \i is include file */`

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!

Commit7515bb4

File tree

2 files changed

2 files changed

`‎src/backend/commands/vacuum.c‎`

`‎src/bin/psql/psql.c‎`

0 commit comments