aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2003-10-04 01:04:46 +0000
committerPeter Eisentraut <peter_e@gmx.net>2003-10-04 01:04:46 +0000
commit9951474c71b8d5145a52e513febc15ad3bf16e7d (patch)
treea69e55249deabe0d8d3533e6d25c26be5783dfec
parentbeb935148a5e6efe9c3c08ba46f5f7527f22d049 (diff)
downloadpostgresql-9951474c71b8d5145a52e513febc15ad3bf16e7d.tar.gz
postgresql-9951474c71b8d5145a52e513febc15ad3bf16e7d.zip
Change transaction status indicator in prompt from %T to %x.
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml4
-rw-r--r--src/bin/psql/prompt.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 784cc06a414..af8c2c5fc34 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.97 2003/09/12 02:40:09 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.98 2003/10/04 01:04:46 petere Exp $
PostgreSQL documentation
-->
@@ -2254,7 +2254,7 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
</varlistentry>
<varlistentry>
- <term><literal>%T</literal></term>
+ <term><literal>%x</literal></term>
<listitem>
<para>
Transaction status: an empty string when not in a transaction
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index fbc0f44381f..18f4b1aac43 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.29 2003/09/03 22:05:09 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.30 2003/10/04 01:04:46 petere Exp $
*/
#include "postgres_fe.h"
#include "prompt.h"
@@ -44,7 +44,7 @@
* or a ! if session is not connected to a database;
* in prompt2 -, *, ', or ";
* in prompt3 nothing
- * %T - transaction status: empty, *, !, ? (unknown or no connection)
+ * %x - transaction status: empty, *, !, ? (unknown or no connection)
* %? - the error code of the last query (not yet implemented)
* %% - a percent sign
*
@@ -208,7 +208,7 @@ get_prompt(promptStatus_t status)
}
break;
- case 'T':
+ case 'x':
if (!pset.db)
buf[0] = '?';
else