postgres.git / summary / log / commit / refs

commit    7e63445d5901bd969e4c45f25753feee7ec8ffd1
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Oct 31 02:29:15 2006 +0000
First released in: 8.2.0

    Fix misstatement about the results of using -1 with BEGIN.


 doc/src/sgml/ref/psql-ref.sgml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index be04f63284b..6f16b1994b0 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.173 2006/10/31 01:52:31 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.174 2006/10/31 02:29:15 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -477,10 +477,12 @@ PostgreSQL documentation
        </para>
 
        <para>
-        If the script itself uses <command>BEGIN</>, <command>COMMIT</>
-        or any command that cannot be executed inside a transaction
-        block, specifying this option will cause the transaction to be
-        aborted.
+        If the script itself uses <command>BEGIN</>, <command>COMMIT</>,
+        or <command>ROLLBACK</>, this option will not have the desired
+        effects.
+        Also, if the script contains any command that cannot be executed
+        inside a transaction block, specifying this option will cause that
+        command (and hence the whole transaction) to fail.
        </para>
       </listitem>
      </varlistentry>


[parent: bc4b856e7b04]