database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

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

Browse Source
This commit is contained in:
Bruce Momjian 1997-08-22 04:13:18 +00:00
parent 5f7f236ba4
commit 7515bb484e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/vacuum.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.41 1997/08/21 03:01:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.42 1997/08/22 04:13:08 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1769,7 +1769,7 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst
while (HeapTupleIsValid(atup = heap_getnext(asdesc, 0, &abuf))) while (HeapTupleIsValid(atup = heap_getnext(asdesc, 0, &abuf)))
{ {
int i; int i;
double selratio; /* average ratio of rows selected for a random constant */ float32data selratio; /* average ratio of rows selected for a random constant */
VacAttrStats *stats; VacAttrStats *stats;
Datum values[ Natts_pg_statistic ]; Datum values[ Natts_pg_statistic ];
char nulls[ Natts_pg_statistic ]; char nulls[ Natts_pg_statistic ];

10
src/bin/psql/psql.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.85 1997/08/22 00:17:26 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.86 1997/08/22 04:13:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -157,7 +157,7 @@ slashUsage(PsqlSettings * ps)
char *pagerenv; char *pagerenv;
FILE *fout; FILE *fout;
if (settings.notty == 0 && if (ps->notty == 0 &&
(pagerenv = getenv("PAGER")) && (pagerenv = getenv("PAGER")) &&
(pagerenv[0] != '\0') && (pagerenv[0] != '\0') &&
(fout = popen(pagerenv, "w"))) (fout = popen(pagerenv, "w")))
@ -1008,7 +1008,7 @@ do_edit(const char *filename_arg, char *query, int *status_p)
static void static void
do_help(const char *topic) do_help(PsqlSettings * ps, const char *topic)
{ {
if (!topic) { if (!topic) {
@ -1049,7 +1049,7 @@ do_help(const char *topic)
FILE *fout; FILE *fout;
if (strcmp(topic, "*") == 0 && if (strcmp(topic, "*") == 0 &&
(settings.notty == 0) && (ps->notty == 0) &&
(pagerenv = getenv("PAGER")) && (pagerenv = getenv("PAGER")) &&
(pagerenv[0] != '\0') && (pagerenv[0] != '\0') &&
(fout = popen(pagerenv, "w"))) (fout = popen(pagerenv, "w")))
@ -1310,7 +1310,7 @@ HandleSlashCmds(PsqlSettings * settings,
break; break;
case 'h': /* help */ case 'h': /* help */
{ {
do_help(optarg); do_help(settings, optarg);
break; break;
} }
case 'i': /* \i is include file */ case 'i': /* \i is include file */