svn commit - mysqldoc@docsrva: r11439 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-6.0

[mcbrown]

Author: mcbrown
Date: 2008-07-30 16:11:25 +0200 (Wed, 30 Jul 2008)
New Revision: 11439

Log:
Documenting Dev Bug # 29371



Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-6.0/se-falcon-core.xml


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-07-30 13:54:34 UTC (rev 11438)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-07-30 14:11:25 UTC (rev 11439)
Changed blocks: 1, Lines Added: 29, Lines Deleted: 0; 950 bytes

@@ -14,6 +14,35 @@
     </tags>
 
     <bugs>
+      <fixes bugid="29371"/>
+    </bugs>
+
+    <versions>
+      <version ver="6.0.4"/>
+    </versions>
+
+    <message>
+
+      <para>
+        A new configuration option, <literal>falcon_support_xa</literal>
+        has been added. The option specifies whether
+        <literal>Falcon</literal> should report itself as a two-phase
+        commit storage engine, and therefore take part in XA
+        transactions.
+      </para>
+
+    </message>
+
+  </logentry>
+
+  <logentry entrytype="bug">
+
+    <tags>
+      <manual type="Falcon"/>
+      <manual type="Replication"/>
+    </tags>
+
+    <bugs>
       <fixes bugid="36468"/>
     </bugs>
 


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2008-07-30 13:54:34 UTC (rev 11438)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2008-07-30 14:11:25 UTC (rev 11439)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 0; 869 bytes

@@ -22268,4 +22268,17 @@
 
   </mysqloption>
 
+<mysqloption id="falcon-support-xa">
+  <xrefto id="option_mysqld_falcon-support-xa"/>
+  <name>falcon-support-xa</name>
+  <shortdescription lang="en">Enables two-phase commit for Falcon tables</shortdescription>
+  <types><optype class="cmdline" setvar="falcon_support_xa"/>
+  <optype class="mycnf"/>
+  <vartype class="system" isdynamic="no" scope="global"/>
+  </types>
+  <values vartype="boolean" platform="all"></values>
+  <versions><manual version="6.0"/><introduced version="6.0.4"/></versions>
+</mysqloption>
+  
+  
 </mysqloptions>


Modified: trunk/refman-6.0/se-falcon-core.xml
===================================================================
--- trunk/refman-6.0/se-falcon-core.xml	2008-07-30 13:54:34 UTC (rev 11438)
+++ trunk/refman-6.0/se-falcon-core.xml	2008-07-30 14:11:25 UTC (rev 11439)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 0; 1255 bytes

@@ -181,6 +181,7 @@
 | falcon_scavenge_schedule         | 15,45 * * * * * | 
 | falcon_serial_log_buffers        | 10              | 
 | falcon_serial_log_dir            |                 | 
+| falcon_support_xa                | 0               |
 | have_falcon                      | YES             | 
 +----------------------------------+-----------------+</programlisting>
 

@@ -692,6 +693,20 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para id="option_mysqld_falcon-support-xa">
+          <literal>falcon_support_xa</literal> &mdash; specifies whether
+          <literal>Falcon</literal> should support two-phase commit.
+          When set to 0 (default), commits are single phase. When set to
+          1, <literal>Falcon</literal> reports itself as a two-phase
+          commit supporting engine and supports two-phase commits.
+        </para>
+
+        <para>
+          This option was added in MySQL 6.0.4.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>