diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/common.c | 5 | ||||
| -rw-r--r-- | src/bin/psql/help.c | 5 | ||||
| -rw-r--r-- | src/bin/psql/startup.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 1b1e4626609..9362886c4ce 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.41 2002/07/06 20:12:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.42 2002/08/10 19:35:00 tgl Exp $ */ #include "postgres_fe.h" @@ -466,7 +466,8 @@ SendQuery(const char *query) /* Possible microtiming output */ if (pset.timing && success) - printf(gettext("Total time: %.3fs\n"), ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000000.0); + printf(gettext("Total time: %.2f msec\n"), + ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000.0); return success; } diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 02d76039752..4e00c5e7d1c 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.53 2002/08/10 16:57:32 petere Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.54 2002/08/10 19:35:01 tgl Exp $ */ #include "postgres_fe.h" #include "print.h" @@ -80,7 +80,8 @@ usage(void) } /* If this " is the start of the string then it ought to end there to fit in 80 columns >> " */ - puts(_("This is psql, the PostgreSQL interactive terminal.\n")); + printf(_("This is psql %s, the PostgreSQL interactive terminal.\n"), + PG_VERSION); puts(_("Usage:")); puts(_(" psql [options] [dbname [username]]\n")); puts(_("Options:")); diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 5f6447c79fe..ed734ec5a19 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.61 2002/07/15 22:48:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.62 2002/08/10 19:35:01 tgl Exp $ */ #include "postgres_fe.h" @@ -281,13 +281,13 @@ main(int argc, char *argv[]) pset.issuper = test_superuser(PQuser(pset.db)); if (!QUIET() && !pset.notty) { - printf(gettext("Welcome to %s, the PostgreSQL interactive terminal.\n\n" + printf(gettext("Welcome to %s %s, the PostgreSQL interactive terminal.\n\n" "Type: \\copyright for distribution terms\n" " \\h for help with SQL commands\n" " \\? for help on internal slash commands\n" " \\g or terminate with semicolon to execute query\n" " \\q to quit\n\n"), - pset.progname); + pset.progname, PG_VERSION); #ifdef USE_SSL printSSLInfo(); #endif |