bk commit - mysqldoc@docsrva tree (paul:1.3372)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3372 05/08/23 14:20:04 paul@stripped +5 -0
  CHAIN/RELEASE for COMMIT/ROLLBACK.
  RELEASE SAVEPOINT.

  refman/sql-syntax.xml
    1.53 05/08/23 14:20:02 paul@stripped +65 -8
    CHAIN/RELEASE for COMMIT/ROLLBACK.
    RELEASE SAVEPOINT.

  refman-5.1/sql-syntax.xml
    1.25 05/08/23 14:20:01 paul@stripped +64 -7
    Sync.

  refman-5.1/mysql-database-administration.xml
    1.27 05/08/23 14:20:01 paul@stripped +52 -0
    Sync.

  refman-5.0/sql-syntax.xml
    1.26 05/08/23 14:20:01 paul@stripped +64 -8
    Sync.

  refman-4.1/sql-syntax.xml
    1.47 05/08/23 14:20:01 paul@stripped +17 -0
    Sync.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.26/refman-5.1/mysql-database-administration.xml	2005-08-22 10:49:42 -05:00
+++ 1.27/refman-5.1/mysql-database-administration.xml	2005-08-23 14:20:01 -05:00
@@ -5846,6 +5846,53 @@
 
         <listitem>
           <para>
+            <literal>completion_type</literal>
+          </para>
+
+          <para>
+            The transaction completion type:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                If the value is 0 (the default),
+                <literal>COMMIT</literal> and
+                <literal>ROLLBACK</literal> are unaffected.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                If the value is 1, <literal>COMMIT</literal> and
+                <literal>ROLLBACK</literal> are equivalent to
+                <literal>COMMIT AND CHAIN</literal> and
+                <literal>ROLLBACK AND CHAIN</literal>, respectively. (A
+                new transaction starts immediately with the same
+                isolation level as the just-terminated transaction.)
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                If the value is 2, <literal>COMMIT</literal> and
+                <literal>ROLLBACK</literal> are equivalent to
+                <literal>COMMIT RELEASE</literal> and <literal>ROLLBACK
+                RELEASE</literal>, respectively. (The server disconnects
+                after terminating the transaction.)
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            This variable was added in MySQL 5.0.3
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <literal>concurrent_insert</literal>
           </para>
 
@@ -8548,6 +8595,11 @@
               <row>
                
<entry><literal>collation_server</literal></entry>
                 <entry>string</entry>
+                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+              </row>
+              <row>
+                <entry><literal>completion_type</literal></entry>
+                <entry>numeric</entry>
                 <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
               </row>
               <row>

--- 1.24/refman-5.1/sql-syntax.xml	2005-08-22 13:48:38 -05:00
+++ 1.25/refman-5.1/sql-syntax.xml	2005-08-23 14:20:01 -05:00
@@ -9253,9 +9253,51 @@
 
       <remark>
         description_for_help_topic START TRANSACTION START TRANSACTION
-        BEGIN WORK COMMIT ROLLBACK SET AUTOCOMMIT
+        BEGIN WORK COMMIT ROLLBACK SET AUTOCOMMIT CHAIN RELEASE
       </remark>
 
+<programlisting>
+START TRANSACTION | BEGIN [WORK]
+COMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+ROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+SET AUTOCOMMIT = {0 | 1}
+</programlisting>
+
+      <para>
+        The <literal>START TRANSACTION</literal> or
+        <literal>BEGIN</literal> statement begin a new transaction.
+        <literal>COMMIT</literal> commits the current transaction,
+        making its changes permanent. <literal>ROLLBACK</literal> rolls
+        back the current transaction, canceling its changes. The
+        <literal>SET AUTOCOMMIT</literal> statement disables or enables
+        the default autocommit mode for the current connection.
+      </para>
+
+      <para>
+        Beginning with MySQL 5.0.3, the optional <literal>WORK</literal>
+        keyword is supported for <literal>COMMIT</literal> and
+        <literal>RELEASE</literal>, as are the
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> clauses.
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> can be used for additional
+        control over transaction completion. The value of the
+        <literal>completion_type</literal> system variable determines
+        the default completion behavior. See
+        <xref linkend="server-system-variables"/>.
+      </para>
+
+      <para>
+        The <literal>AND CHAIN</literal> clause causes a new transaction
+        to begin as soon as the current one end, and the new transaction
+        has the same isolation level as the just-terminated transaction.
+        The <literal>RELEASE</literal> clause causes the server to
+        disconnect the current client connection after terminating the
+        current transaction. Including the <literal>NO</literal> keyword
+        suppresses <literal>CHAIN</literal> or
+        <literal>RELEASE</literal> completion, which can be useful if
+        the <literal>completion_type</literal> system variable is set to
+        cause chaining or release completion by default.
+      </para>
+
       <para>
         By default, MySQL runs with autocommit mode enabled. This means
         that as soon as you execute a statement that updates (modifies)
@@ -9538,23 +9580,31 @@
         <primary>ROLLBACK TO SAVEPOINT</primary>
       </indexterm>
 
+      <indexterm type="function">
+        <primary>RELEASE SAVEPOINT</primary>
+      </indexterm>
+
       <remark>
         help_category Transactions
       </remark>
 
       <remark>
         description_for_help_topic SAVEPOINT ROLLBACK TO SAVEPOINT
+        RELEASE
       </remark>
 
 <programlisting>
-SAVEPOINT identifier
-ROLLBACK TO SAVEPOINT identifier
+SAVEPOINT <replaceable>identifier</replaceable>
+ROLLBACK TO SAVEPOINT <replaceable>identifier</replaceable>
+RELEASE SAVEPOINT <replaceable>identifier</replaceable>
 </programlisting>
 
       <para>
         In MySQL 5.0, <literal>InnoDB</literal> supports the SQL
         statements <literal>SAVEPOINT</literal> and <literal>ROLLBACK
TO
-        SAVEPOINT</literal>.
+        SAVEPOINT</literal>. Starting from MySQL 5.0.3, <literal>RELEASE
+        SAVEPOINT</literal> and the optional <literal>WORK</literal>
+        keyword for <literal>ROLLBACK</literal> are supported as well.
 
         <remark>
           end_description_for_help_topic
@@ -9564,9 +9614,9 @@
       <para>
         The <literal>SAVEPOINT</literal> statement sets a named
         transaction save point with a name of
-        <literal>identifier</literal>. If the current transaction has a
-        save point with the same name, the old save point is deleted and
-        a new one is set.
+        <replaceable>identifier</replaceable>. If the current
+        transaction has a save point with the same name, the old save
+        point is deleted and a new one is set.
       </para>
 
       <para>
@@ -9591,6 +9641,13 @@
 <programlisting>
 ERROR 1181: Got error 153 during ROLLBACK
 </programlisting>
+
+      <para>
+        The <literal>RELEASE SAVEPOINT</literal> statement removes the
+        named savepoint from the set of savepoint of the current
+        transaction. No commit or rollback occurs. It is an error if the
+        savepoint does not exist.
+      </para>
 
       <para>
         All save points of the current transaction are deleted if you

--- 1.46/refman-4.1/sql-syntax.xml	2005-08-22 13:48:37 -05:00
+++ 1.47/refman-4.1/sql-syntax.xml	2005-08-23 14:20:01 -05:00
@@ -9045,6 +9045,23 @@
 
 <!--  description_for_help_topic START TRANSACTION  START TRANSACTION BEGIN WORK
COMMIT ROLLBACK SET AUTOCOMMIT -->
 
+<programlisting>
+START TRANSACTION | BEGIN [WORK]
+COMMIT
+ROLLBACK
+SET AUTOCOMMIT = {0 | 1}
+</programlisting>
+
+      <para>
+        The <literal>START TRANSACTION</literal> or
+        <literal>BEGIN</literal> statement begin a new transaction.
+        <literal>COMMIT</literal> commits the current transaction,
+        making its changes permanent. <literal>ROLLBACK</literal> rolls
+        back the current transaction, canceling its changes. The
+        <literal>SET AUTOCOMMIT</literal> statement disables or enables
+        the default autocommit mode for the current connection.
+      </para>
+
       <para>
         By default, MySQL runs with autocommit mode enabled. This means
         that as soon as you execute a statement that updates (modifies)

--- 1.52/refman/sql-syntax.xml	2005-08-22 13:48:38 -05:00
+++ 1.53/refman/sql-syntax.xml	2005-08-23 14:20:02 -05:00
@@ -9347,7 +9347,49 @@
         <primary>ROLLBACK</primary>
       </indexterm>
 
-<!--  description_for_help_topic START TRANSACTION  START TRANSACTION BEGIN WORK
COMMIT ROLLBACK SET AUTOCOMMIT -->
+<!--  description_for_help_topic START TRANSACTION  START TRANSACTION BEGIN WORK
COMMIT ROLLBACK SET AUTOCOMMIT CHAIN RELEASE -->
+
+<programlisting>
+START TRANSACTION | BEGIN [WORK]
+COMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+ROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+SET AUTOCOMMIT = {0 | 1}
+</programlisting>
+
+      <para>
+        The <literal>START TRANSACTION</literal> or
+        <literal>BEGIN</literal> statement begin a new transaction.
+        <literal>COMMIT</literal> commits the current transaction,
+        making its changes permanent. <literal>ROLLBACK</literal> rolls
+        back the current transaction, canceling its changes. The
+        <literal>SET AUTOCOMMIT</literal> statement disables or enables
+        the default autocommit mode for the current connection.
+      </para>
+
+      <para>
+        Beginning with MySQL 5.0.3, the optional <literal>WORK</literal>
+        keyword is supported for <literal>COMMIT</literal> and
+        <literal>RELEASE</literal>, as are the
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> clauses.
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> can be used for additional
+        control over transaction completion. The value of the
+        <literal>completion_type</literal> system variable determines
+        the default completion behavior. See
+        <xref linkend="server-system-variables"/>.
+      </para>
+
+      <para>
+        The <literal>AND CHAIN</literal> clause causes a new transaction
+        to begin as soon as the current one end, and the new transaction
+        has the same isolation level as the just-terminated transaction.
+        The <literal>RELEASE</literal> clause causes the server to
+        disconnect the current client connection after terminating the
+        current transaction. Including the <literal>NO</literal> keyword
+        suppresses <literal>CHAIN</literal> or
+        <literal>RELEASE</literal> completion, which can be useful if
+        the <literal>completion_type</literal> system variable is set to
+        cause chaining or release completion by default.
+      </para>
 
       <para>
         By default, MySQL runs with autocommit mode enabled. This means
@@ -9638,19 +9680,27 @@
         <primary>ROLLBACK TO SAVEPOINT</primary>
       </indexterm>
 
+      <indexterm type="function">
+        <primary>RELEASE SAVEPOINT</primary>
+      </indexterm>
+
 <!--  help_category Transactions -->
 
-<!--  description_for_help_topic SAVEPOINT  ROLLBACK TO SAVEPOINT -->
+<!--  description_for_help_topic SAVEPOINT  ROLLBACK TO SAVEPOINT RELEASE -->
 
 <programlisting>
-SAVEPOINT identifier
-ROLLBACK TO SAVEPOINT identifier
+SAVEPOINT <replaceable>identifier</replaceable>
+ROLLBACK [WORK] TO SAVEPOINT <replaceable>identifier</replaceable>
+RELEASE SAVEPOINT <replaceable>identifier</replaceable>
 </programlisting>
 
       <para>
         Starting from MySQL 4.0.14 and 4.1.1, <literal>InnoDB</literal>
         supports the SQL statements <literal>SAVEPOINT</literal> and
-        <literal>ROLLBACK TO SAVEPOINT</literal>.
+        <literal>ROLLBACK TO SAVEPOINT</literal>. Starting from MySQL
+        5.0.3, <literal>RELEASE SAVEPOINT</literal> and the optional
+        <literal>WORK</literal> keyword for
<literal>ROLLBACK</literal>
+        are supported as well.
 
 <!--  end_description_for_help_topic -->
       </para>
@@ -9658,9 +9708,9 @@
       <para>
         The <literal>SAVEPOINT</literal> statement sets a named
         transaction savepoint with a name of
-        <literal>identifier</literal>. If the current transaction has a
-        savepoint with the same name, the old savepoint is deleted and a
-        new one is set.
+        <replaceable>identifier</replaceable>. If the current
+        transaction has a savepoint with the same name, the old
+        savepoint is deleted and a new one is set.
       </para>
 
       <para>
@@ -9685,6 +9735,13 @@
 <programlisting>
 ERROR 1181: Got error 153 during ROLLBACK
 </programlisting>
+
+      <para>
+        The <literal>RELEASE SAVEPOINT</literal> statement removes the
+        named savepoint from the set of savepoint of the current
+        transaction. No commit or rollback occurs. It is an error if the
+        savepoint does not exist.
+      </para>
 
       <para>
         All savepoints of the current transaction are deleted if you

--- 1.25/refman-5.0/sql-syntax.xml	2005-08-22 13:48:38 -05:00
+++ 1.26/refman-5.0/sql-syntax.xml	2005-08-23 14:20:01 -05:00
@@ -9068,7 +9068,49 @@
         <primary>ROLLBACK</primary>
       </indexterm>
 
-<!--  description_for_help_topic START TRANSACTION  START TRANSACTION BEGIN WORK
COMMIT ROLLBACK SET AUTOCOMMIT -->
+<!--  description_for_help_topic START TRANSACTION  START TRANSACTION BEGIN WORK
COMMIT ROLLBACK SET AUTOCOMMIT CHAIN RELEASE -->
+
+<programlisting>
+START TRANSACTION | BEGIN [WORK]
+COMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+ROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
+SET AUTOCOMMIT = {0 | 1}
+</programlisting>
+
+      <para>
+        The <literal>START TRANSACTION</literal> or
+        <literal>BEGIN</literal> statement begin a new transaction.
+        <literal>COMMIT</literal> commits the current transaction,
+        making its changes permanent. <literal>ROLLBACK</literal> rolls
+        back the current transaction, canceling its changes. The
+        <literal>SET AUTOCOMMIT</literal> statement disables or enables
+        the default autocommit mode for the current connection.
+      </para>
+
+      <para>
+        Beginning with MySQL 5.0.3, the optional <literal>WORK</literal>
+        keyword is supported for <literal>COMMIT</literal> and
+        <literal>RELEASE</literal>, as are the
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> clauses.
<literal>CHAIN</literal>
+        and <literal>RELEASE</literal> can be used for additional
+        control over transaction completion. The value of the
+        <literal>completion_type</literal> system variable determines
+        the default completion behavior. See
+        <xref linkend="server-system-variables"/>.
+      </para>
+
+      <para>
+        The <literal>AND CHAIN</literal> clause causes a new transaction
+        to begin as soon as the current one end, and the new transaction
+        has the same isolation level as the just-terminated transaction.
+        The <literal>RELEASE</literal> clause causes the server to
+        disconnect the current client connection after terminating the
+        current transaction. Including the <literal>NO</literal> keyword
+        suppresses <literal>CHAIN</literal> or
+        <literal>RELEASE</literal> completion, which can be useful if
+        the <literal>completion_type</literal> system variable is set to
+        cause chaining or release completion by default.
+      </para>
 
       <para>
         By default, MySQL runs with autocommit mode enabled. This means
@@ -9352,19 +9394,26 @@
         <primary>ROLLBACK TO SAVEPOINT</primary>
       </indexterm>
 
+      <indexterm type="function">
+        <primary>RELEASE SAVEPOINT</primary>
+      </indexterm>
+
 <!--  help_category Transactions -->
 
-<!--  description_for_help_topic SAVEPOINT  ROLLBACK TO SAVEPOINT -->
+<!--  description_for_help_topic SAVEPOINT  ROLLBACK TO SAVEPOINT RELEASE -->
 
 <programlisting>
-SAVEPOINT identifier
-ROLLBACK TO SAVEPOINT identifier
+SAVEPOINT <replaceable>identifier</replaceable>
+ROLLBACK [WORK] TO SAVEPOINT <replaceable>identifier</replaceable>
+RELEASE SAVEPOINT <replaceable>identifier</replaceable>
 </programlisting>
 
       <para>
         In MySQL 5.0, <literal>InnoDB</literal> supports the SQL
         statements <literal>SAVEPOINT</literal> and <literal>ROLLBACK
TO
-        SAVEPOINT</literal>.
+        SAVEPOINT</literal>. Starting from MySQL 5.0.3, <literal>RELEASE
+        SAVEPOINT</literal> and the optional <literal>WORK</literal>
+        keyword for <literal>ROLLBACK</literal> are supported as well.
 
 <!--  end_description_for_help_topic -->
       </para>
@@ -9372,9 +9421,9 @@
       <para>
         The <literal>SAVEPOINT</literal> statement sets a named
         transaction save point with a name of
-        <literal>identifier</literal>. If the current transaction has a
-        save point with the same name, the old save point is deleted and
-        a new one is set.
+        <replaceable>identifier</replaceable>. If the current
+        transaction has a save point with the same name, the old save
+        point is deleted and a new one is set.
       </para>
 
       <para>
@@ -9399,6 +9448,13 @@
 <programlisting>
 ERROR 1181: Got error 153 during ROLLBACK
 </programlisting>
+
+      <para>
+        The <literal>RELEASE SAVEPOINT</literal> statement removes the
+        named savepoint from the set of savepoint of the current
+        transaction. No commit or rollback occurs. It is an error if the
+        savepoint does not exist.
+      </para>
 
       <para>
         All save points of the current transaction are deleted if you