aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml/ref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/sgml/ref')
-rw-r--r--doc/src/sgml/ref/begin.sgml8
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml10
-rw-r--r--doc/src/sgml/ref/set.sgml8
-rw-r--r--doc/src/sgml/ref/show.sgml8
4 files changed, 9 insertions, 25 deletions
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 1c5fe0f6ce8..7bd1309d289 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.23 2003/04/15 13:25:08 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.24 2003/05/14 03:26:00 tgl Exp $
PostgreSQL documentation
-->
@@ -98,12 +98,6 @@ BEGIN [ WORK | TRANSACTION ]
<xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE">
to terminate a transaction.
</para>
-
- <para>
- If you turn the configuration parameter <varname>autocommit</> off,
- then <command>BEGIN</> is not required: any SQL command
- automatically starts a transaction.
- </para>
</refsect1>
<refsect1>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 49e4f998da0..8dd25d572e4 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.88 2003/03/25 16:15:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.89 2003/05/14 03:26:00 tgl Exp $
PostgreSQL documentation
-->
@@ -88,9 +88,11 @@ PostgreSQL documentation
select * from foo;" | psql</literal>.
</para>
<para>
- If <quote>autocommit</quote> is on, multiple queries in a single
- string are processed in a single transaction.
-
+ If the command string contains multiple SQL commands, they are
+ processed in a single transaction, unless there are explicit
+ BEGIN/COMMIT commands included in the string to divide it into
+ multiple transactions. This is different from the behavior when
+ the same string is fed to psql's standard input.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index eba67d05775..170afd13dae 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.75 2003/05/04 02:23:16 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.76 2003/05/14 03:26:00 tgl Exp $
PostgreSQL documentation
-->
@@ -55,12 +55,6 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
seen until the end of the transaction, but afterwards (if the transaction
is committed) the <command>SET</command> value will take effect.
</para>
-
- <para>
- Even with <varname>autocommit</> set to <literal>off</>, <command>SET</>
- does not start a new transaction block. See the
- <varname>autocommit</> section in <xref linkend="runtime-config"> for details.
- </para>
</refsect1>
<refsect1>
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index dd8e9cf0412..0232d97dfce 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.26 2003/05/04 02:23:16 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.27 2003/05/14 03:26:00 tgl Exp $
PostgreSQL documentation
-->
@@ -37,12 +37,6 @@ SHOW ALL
<command>postmaster</command>. See <xref
linkend="runtime-config"> for details.
</para>
-
- <para>
- Even with <varname>autocommit</> set to <literal>off</>, <command>SHOW</>
- does not start a new transaction block. See the
- <varname>autocommit</> section in <xref linkend="runtime-config"> for details.
- </para>
</refsect1>
<refsect1>