From: jon
Date: January 9 2009 7:05pm
Subject: svn commit - mysqldoc@docsrva: r13078 - in trunk: dynamic-docs/changelog mysql-monitor-2.0 mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
List-Archive: http://lists.mysql.com/commits/62889
Message-Id: <200901091905.n09J5KGI004237@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jstephens
Date: 2009-01-09 20:05:19 +0100 (Fri, 09 Jan 2009)
New Revision: 13078

Log:

Documented multi-threaded data node process (ndbmtd) for Cluster 6.4.0.

Updated dependencies.



Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/mysql-cluster-configuration.xml
   trunk/refman-5.1/mysql-cluster-process-management.xml
   trunk/refman-5.1/mysql-cluster-roadmap.xml
   trunk/refman-6.0/Makefile.depends


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 1, Lines Added: 30, Lines Deleted: 0; 1047 bytes

@@ -6,6 +6,36 @@
 ]>
 <changelog>
 
+  <logentry entrytype="feature">
+
+    <tags>
+      <highlight type="cluster"/>
+      <manual type="ndbmtd"/>
+    </tags>
+
+    <versions>
+      <version ver="5.1.30-ndb-6.4.0"/>
+    </versions>
+
+    <message>
+
+      <para>
+        A multi-threaded version of the MySQL Cluster data node daemon
+        is now available. The multi-threaded <command>ndbmtd</command>
+        binary is similar to <command>ndbd</command> and functions in
+        much the same way, but is intended for use on machines with
+        multiple CPU cores.
+      </para>
+
+      <para>
+        For more information, see
+        <xref linkend="mysql-cluster-ndbmtd-process"/>.
+      </para>
+
+    </message>
+
+  </logentry>
+
   <logentry entrytype="bug">
 
     <tags>


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 2104 bytes

@@ -14,7 +14,7 @@
 dashboard_advisors_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-configure.idmap \
-	../mysql-monitor-2.0/metadata/data-items.idmap \
+	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/install.idmap
 dashboard-advisors.validpure: $(dashboard_advisors_SOURCES)
 dashboard-advisors.titles: $(dashboard_advisors_SOURCES)

@@ -611,7 +611,7 @@
 	images/published/usage-advisor-configuration.png
 monitor_refman_chapter_arbitrary_SOURCES = monitor-refman-chapter-arbitrary.xml $(monitor_refman_chapter_arbitrary_INCLUDES)
 monitor_refman_chapter_arbitrary_IDMAPS = \
-	../mysql-monitor-2.0/metadata/data-items.idmap \
+	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \

@@ -766,7 +766,7 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-query-analysis.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
-	../mysql-monitor-2.0/metadata/data-items.idmap \
+	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/install.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \

@@ -928,7 +928,7 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-query-analysis.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
-	../mysql-monitor-2.0/metadata/data-items.idmap \
+	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/install.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/mysqlqb/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 575 bytes

@@ -67,7 +67,7 @@
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/credits.idmap \
-	metadata/mysqlqb_functions.idmap
+	../refman-common/metadata/regexp.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-4.1/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 2; 2278 bytes

@@ -884,6 +884,10 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
+	../refman-4.1/metadata/dba-log-files.idmap \
+	../refman-4.1/metadata/dba-mysqld-server-core.idmap \
+	../refman-4.1/metadata/dba.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
 	../refman-4.1/metadata/extending-mysql.idmap \
 	../refman-4.1/metadata/installing.idmap \
 	../refman-4.1/metadata/language-structure.idmap \

@@ -891,6 +895,7 @@
 	../refman-4.1/metadata/se-innodb-core.idmap \
 	../refman-4.1/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-4.1/metadata/sql-syntax-server-administration.idmap \
+	../refman-4.1/metadata/sql-syntax-utility.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)

@@ -935,7 +940,6 @@
 	../refman-4.1/metadata/dba-privilege-system.idmap \
 	../refman-4.1/metadata/dba-security-core.idmap \
 	../refman-4.1/metadata/dba-user-management-core.idmap \
-	../refman-4.1/metadata/dba.idmap \
 	../refman-4.1/metadata/errors-problems.idmap \
 	../refman-4.1/metadata/extending-mysql.idmap \
 	../refman-4.1/metadata/functions-core.idmap \

@@ -959,7 +963,6 @@
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-4.1/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-4.1/metadata/sql-syntax-replication.idmap \
-	../refman-4.1/metadata/sql-syntax-utility.idmap \
 	../refman-4.1/metadata/storage-engines.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap

@@ -1077,6 +1080,7 @@
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/language-structure.idmap \
 	../refman-4.1/metadata/sql-syntax-data-manipulation.idmap \
+	../refman-4.1/metadata/sql-syntax-prepared-statements.idmap \
 	../refman-common/metadata/apis-perl.idmap
 language-structure.validpure: $(language_structure_SOURCES)
 language-structure.titles: $(language_structure_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.0/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 1; 1527 bytes

@@ -1304,7 +1304,6 @@
 	../refman-5.0/metadata/installing-core.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \
 	../refman-5.0/metadata/programs-using.idmap \
-	../refman-5.0/metadata/replication-options-core.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \
 	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \

@@ -1827,6 +1826,7 @@
 	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
 	../mysql-monitor-2.0/../common/fixedchars.ent \
 	../mysql-monitor-2.0/../common/phrases.ent \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \

@@ -2522,6 +2522,7 @@
 	../mysql-monitor-2.0/../common/phrases.ent \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor-versions.xml \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor.xml \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.1/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 1; 1541 bytes

@@ -1350,7 +1350,6 @@
 	../refman-5.1/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/programs-using.idmap \
-	../refman-5.1/metadata/replication-options-core.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \

@@ -1858,6 +1857,7 @@
 	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
 	../mysql-monitor-2.0/../common/fixedchars.ent \
 	../mysql-monitor-2.0/../common/phrases.ent \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \

@@ -2602,6 +2602,7 @@
 	../mysql-monitor-2.0/../common/phrases.ent \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor-versions.xml \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor.xml \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \


Modified: trunk/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration.xml	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.1/mysql-cluster-configuration.xml	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 3, Lines Added: 32, Lines Deleted: 6; 2646 bytes

@@ -1695,13 +1695,22 @@
         Parameter names and values are currently case-sensitive.
       </para>
 
-      <note>
-        <para>
-          Information about configuration parameters specific to MySQL
-          Cluster Disk Data tables can be found later in this section.
-        </para>
-      </note>
+      <para>
+        Information about configuration parameters specific to MySQL
+        Cluster Disk Data tables can be found later in this section.
+      </para>
 
+      <para>
+        Beginning with MySQL Cluster NDB 6.4.0, all of these parameters
+        also apply to <command>ndbmtd</command> (the multi-threaded
+        version of <command>ndbd</command>). An additional data node
+        configuration parameter
+        <literal>MaxNoOfExecutionThreads</literal> applies to
+        <command>ndbmtd</command> only, and has no effect when used with
+        <command>ndbd</command>. For a description of this parameter and
+        its use, see <xref linkend="mysql-cluster-ndbmtd-process"/>.
+      </para>
+
       <formalpara>
 
         <title>Identifying data nodes</title>

@@ -6209,6 +6218,13 @@
       </para>
 
       <para>
+        Beginning with MySQL Cluster NDB 6.4.0, these parameters also
+        apply to <command>ndbmtd</command>, which is a multi-threaded
+        version of <command>ndbd</command>. For more information, see
+        <xref linkend="mysql-cluster-ndbmtd-process"/>.
+      </para>
+
+      <para>
         <emphasis><emphasis role="bold">Restart Type</emphasis> Column
         Values</emphasis>
       </para>

@@ -6667,6 +6683,16 @@
               <entry>S</entry>
             </row>
             <row>
+              <entry><literal><link linkend="mysql-cluster-param-ndbmtd-maxnoofexecutionthreads">MaxNoOfExecutionThreads</link></literal>
+                (added in MySQL Cluster NDB 6.4.0; <emphasis>applies to
+                <command>ndbmtd</command> only</emphasis>)</entry>
+              <entry>integer</entry>
+              <entry><emphasis>none</emphasis></entry>
+              <entry>2</entry>
+              <entry>8</entry>
+              <entry>N</entry>
+            </row>
+            <row>
               <entry><literal><link linkend="mysql-cluster-param-ndbd-definition-maxnooffiredtriggers">MaxNoOfFiredTriggers</link></literal></entry>
               <entry>integer</entry>
               <entry>4000</entry>


Modified: trunk/refman-5.1/mysql-cluster-process-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-process-management.xml	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.1/mysql-cluster-process-management.xml	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 8, Lines Added: 347, Lines Deleted: 2; 14141 bytes

@@ -569,6 +569,299 @@
 
   </section>
 
+  <section id="fake-id-for-ndbmtd-manpage-section-wrapper">
+
+    <title>fake title for ndbmtd man page section wrapper</title>
+
+    <refentry id="mysql-cluster-ndbmtd-process">
+
+      <indexterm>
+        <primary>ndbmtd (MySQL Cluster process)</primary>
+      </indexterm>
+
+      <indexterm>
+        <primary>MySQL Cluster</primary>
+        <secondary>ndbmtd process</secondary>
+      </indexterm>
+
+      <indexterm>
+        <primary>MySQL Cluster</primary>
+        <secondary>data nodes</secondary>
+      </indexterm>
+
+      <indexterm>
+        <primary>data nodes (MySQL Cluster)</primary>
+      </indexterm>
+
+      <indexterm>
+        <primary>storage nodes - see data nodes, ndbd, ndbmtd</primary>
+        <see>data nodes, ndbd, ndbmtd</see>
+      </indexterm>
+
+      <refmeta>
+        <refentrytitle><command>ndbmtd</command></refentrytitle>
+         
+        <manvolnum>8</manvolnum>
+        <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
+        <refmiscinfo class="source">MySQL</refmiscinfo>
+        <refmiscinfo class="version">&current-series;</refmiscinfo>
+        <refmiscinfo class="refman">The Storage Engine Node Process (Multi-Threaded)</refmiscinfo>
+      </refmeta>
+
+      <refnamediv>
+        <refname>ndbmtd</refname>
+         
+        <refpurpose>the storage engine node process (multi-threaded version)</refpurpose>
+      </refnamediv>
+
+      <refsynopsisdiv>
+        <cmdsynopsis>
+          <command>ndbmtd <replaceable>options</replaceable></command>
+        </cmdsynopsis>
+      </refsynopsisdiv>
+
+      <refsection id="ndbmtd-description">
+
+        <title>Description</title>
+
+        <para>
+          <command>ndbmtd</command> is a multi-threaded version of
+          <command>ndbd</command>, the process that is used to handle
+          all the data in tables using the
+          <literal role="se">NDBCLUSTER</literal> storage engine.
+          <command>ndbmtd</command> is intended for use on host
+          computers having multiple CPU cores. Except where otherwise
+          noted, <command>ndbmtd</command> functions in the same way as
+          <command>ndbd</command>; therefore, in this section, we
+          concentrate on the ways in which <command>ndbmtd</command>
+          differs from <command>ndbd</command>, and you should consult
+          <xref linkend="mysql-cluster-ndbd-process"/>, for additional
+          information about running MySQL Cluster data nodes that apply
+          to both the single-threaded and multi-threaded versions of the
+          data node process.
+        </para>
+
+        <para>
+          Command-line options and configuration parameters used with
+          <command>ndbd</command> also apply to
+          <command>ndbmtd</command>. For more information about these
+          options and parameters, see
+          <xref linkend="mysql-cluster-ndbd-command-options"/>, and
+          <xref linkend="mysql-cluster-ndbd-definition"/>, respectively.
+        </para>
+
+        <para>
+          Using <command>ndbmtd</command> differs from using
+          <command>ndbd</command> in two key respects:
+        </para>
+
+        <orderedlist>
+
+          <listitem>
+            <para>
+              You must set an appropriate value for the
+              <literal>MaxNoOfExecutionThreads</literal> configuration
+              parameter in the <filename>config.ini</filename> file.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              Trace files are generated by critical errors in
+              <command>ndbmtd</command> processes in a somewhat
+              different fashion from how these are generated by
+              <command>ndbd</command> failures.
+            </para>
+          </listitem>
+
+        </orderedlist>
+
+        <indexterm>
+          <primary>ndbmtd</primary>
+          <secondary>MaxNoOfExecutionThreads</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>MaxNoOfExecutionThreads</primary>
+          <secondary>ndbmtd</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>ndbmtd</primary>
+          <secondary>trace files</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>trace files</primary>
+          <secondary>ndbmtd</secondary>
+        </indexterm>
+
+        <formalpara>
+
+          <title>Number of execution threads</title>
+
+          <para id="mysql-cluster-param-ndbmtd-maxnoofexecutionthreads">
+            The <literal>MaxNoOfExecutionThreads</literal> configuration
+            parameter is used to determine the number of execution
+            threads spawned by <command>ndbmtd</command>. Although this
+            parameter is set in <literal>[ndbd]</literal> or
+            <literal>[ndbd default]</literal> sections of the
+            <filename>config.ini</filename> file, it is exclusive to
+            <command>ndbmtd</command> and does not apply to
+            <command>ndbd</command>.
+          </para>
+
+        </formalpara>
+
+        <para>
+          This parameter takes an integer value from 2 to 8 inclusive.
+          Generally, you should set this to the number of CPU cores on
+          the data node host, as shown in the following table:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="50*"/>
+            <colspec colwidth="50*"/>
+            <thead>
+              <row>
+                <entry>Number of Cores</entry>
+                <entry>Recommended <literal>MaxNoOfExecutionThreads</literal> Value</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>2</entry>
+                <entry>2</entry>
+              </row>
+              <row>
+                <entry>4</entry>
+                <entry>4</entry>
+              </row>
+              <row>
+                <entry>8 or more</entry>
+                <entry>8</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
+          It is possible to set this parameter to other values, but
+          these are automatically rounded as follows:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="50*"/>
+            <colspec colwidth="50*"/>
+            <thead>
+              <row>
+                <entry><filename>config.ini</filename> Value</entry>
+                <entry>Value Used</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>3</entry>
+                <entry>2</entry>
+              </row>
+              <row>
+                <entry>5 or 6</entry>
+                <entry>4</entry>
+              </row>
+              <row>
+                <entry>7</entry>
+                <entry>8</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
+          Setting this parameter outside the permitted range of values
+          causes the management server to abort on startup with the
+          error <errortext>Error line <replaceable>number</replaceable>:
+          Illegal value <replaceable>value</replaceable> for parameter
+          MaxNoOfExecutionThreads</errortext>.
+        </para>
+
+        <note>
+          <para>
+            In MySQL Cluster NDB 6.4.0, it is not possible to set
+            <literal>MaxNoOfExecution</literal> threads to 2. You can
+            safely use the value 3 instead (it is treated as 2
+            internally). This issue is resolved in MySQL Cluster NDB
+            6.4.1.
+          </para>
+        </note>
+
+        <indexterm>
+          <primary>MySQL Cluster</primary>
+          <secondary>log files</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>log files (MySQL Cluster)</primary>
+          <secondary>ndbmtd</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>ndbmtd</primary>
+          <secondary>trace files</secondary>
+        </indexterm>
+
+        <para>
+          Like <command>ndbd</command>, <command>ndbmtd</command>
+          generates a set of log files which are placed in the directory
+          specified by <literal>DataDir</literal> in the
+          <filename>config.ini</filename> configuration file. Except for
+          trace files, these are generated in the same way and have the
+          same names as those generated by <command>ndbd</command>.
+        </para>
+
+        <para>
+          In the event of a critical error, <command>ndbmtd</command>
+          generates trace files describing what happened just prior to
+          the error&apos; occurrence. These files, which can be found in
+          the data node&apos;s <literal>DataDir</literal>, are useful
+          for analysis of problems by the MySQL Cluster Development and
+          Support teams. One trace file is generated for each
+          <command>ndbmtd</command> thread. The names of these files
+          follow the pattern
+          <filename>ndb_<replaceable>node_id</replaceable>_trace.log.<replaceable>trace_id</replaceable>_t<replaceable>thread_id</replaceable></filename>,
+          where <replaceable>node_id</replaceable> is the data
+          node&apos;s unique node ID in the cluster,
+          <replaceable>trace_id</replaceable> is a trace sequence
+          number, and <replaceable>thread_id</replaceable> is the thread
+          ID. For example, in the event of the failure of an
+          <command>ndbmtd</command> process running as a MySQL Cluster
+          data node having the node ID 3 and with
+          <literal>MaxNoOfExecutionThreads</literal> equal to 4, four
+          trace files are generated in the data node&apos;s data
+          directory; if the is the first time this node has failed, then
+          these files are named
+          <filename>ndb_3_trace.log.1_t1</filename>,
+          <filename>ndb_3_trace.log.1_t2</filename>,
+          <filename>ndb_3_trace.log.1_t3</filename>, and
+          <filename>ndb_3_trace.log.1_t4</filename>. Internally, these
+          trace files follow the same format as <command>ndbd</command>
+          trace files.
+        </para>
+
+        <para>
+          The <command>ndbd</command> exit codes and messages that are
+          generated when a data node process shuts down prematurely are
+          also used by <command>ndbmtd</command>. See
+          <xref linkend="ndbd-error-messages"/>, for a listing of these.
+        </para>
+
+      </refsection>
+
+    </refentry>
+
+  </section>
+
   <section id="fake-id-for-ndb-mgmd-manpage-section-wrapper">
 
     <title>fake title for ndb_mgmd man page section wrapper</title>

@@ -1047,7 +1340,8 @@
 
     <section id="mysql-cluster-ndbd-command-options">
 
-      <title>Command Options for <command>ndbd</command></title>
+      <title>Command Options for <command>ndbd</command> and
+        <command>ndbmtd</command></title>
 
       <indexterm>
         <primary>MySQL Cluster</primary>

@@ -1065,12 +1359,39 @@
       </indexterm>
 
       <indexterm>
+        <primary>command options (MySQL Cluster)</primary>
+        <secondary>ndbmtd</secondary>
+      </indexterm>
+
+      <indexterm>
         <primary>MySQL Cluster</primary>
         <secondary>ndbd process</secondary>
       </indexterm>
 
+      <indexterm>
+        <primary>MySQL Cluster</primary>
+        <secondary>ndbmtd process</secondary>
+      </indexterm>
+
       <para>
-        For options common to all <literal>NDB</literal> programs, see
+        This section describes command options specific to the MySQL
+        Cluster data node program <command>ndbd</command>.
+      </para>
+
+      <note>
+        <para>
+          All of these options also apply to the multi-threaded version
+          of this program &mdash; <command>ndbmtd</command>, which is
+          available beginning with MySQL Cluster NDB 6.4.0 &mdash; and
+          you may substitute <quote><command>ndbmtd</command></quote>
+          for <quote><command>ndbd</command></quote> wherever the latter
+          occurs in this section.
+        </para>
+      </note>
+
+      <para>
+        For options common to all
+        <literal role="se">NDBCLUSTER</literal> programs, see
         <xref linkend="mysql-cluster-command-options"/>.
       </para>
 

@@ -1110,6 +1431,10 @@
             <primary>--initial option (ndbd)</primary>
           </indexterm>
 
+          <indexterm>
+            <primary>--initial option (ndbmtd)</primary>
+          </indexterm>
+
           <para>
             <option>--initial</option>
           </para>

@@ -1197,6 +1522,10 @@
             <primary>--initial-start option (ndbd)</primary>
           </indexterm>
 
+          <indexterm>
+            <primary>--initial-start option (ndbmtd)</primary>
+          </indexterm>
+
           <para>
             <option>--initial-start</option>
           </para>

@@ -1238,6 +1567,10 @@
             <primary>--nowait-nodes option (ndbd)</primary>
           </indexterm>
 
+          <indexterm>
+            <primary>--nowait-nodes option (ndbmtd)</primary>
+          </indexterm>
+
           <para>
             <option>--nowait-nodes=<replaceable>node_id_1</replaceable>[,
             <replaceable>node_id_2</replaceable>[, ...]]</option>

@@ -1280,6 +1613,10 @@
             <primary>--nodaemon option (ndbd)</primary>
           </indexterm>
 
+          <indexterm>
+            <primary>--nodaemon option (ndbmtd)</primary>
+          </indexterm>
+
           <para>
             <option>--nodaemon</option>
           </para>

@@ -1301,6 +1638,14 @@
             <primary>-n option (ndbd)</primary>
           </indexterm>
 
+          <indexterm>
+            <primary>--nostart option (ndbmtd)</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>-n option (ndbmtd)</primary>
+          </indexterm>
+
           <para>
             <option>--nostart</option>, <option>-n</option>
           </para>


Modified: trunk/refman-5.1/mysql-cluster-roadmap.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-roadmap.xml	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.1/mysql-cluster-roadmap.xml	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1222 bytes

@@ -1373,12 +1373,11 @@
           <para>
             A multithreaded version of the data node daemon,
             <command>ndbmtd</command>, is available for use on data node
-            hosts with multiple cores/CPUs. New configuration parameters
-            are available for optimizing <command>ndbmtd</command>
-            usage; for example, it is possible to locking specific data
-            node processes to specific cores/CPUs. In all other major
-            respects, <command>ndbmtd</command> functions the same as
-            <command>ndbd</command>.
+            hosts with multiple CPU cores. In most respects,
+            <command>ndbmtd</command> functions in the same way as
+            <command>ndbd</command>, and can use the same command-line
+            options and configuration parameters. For more information,
+            see <xref linkend="mysql-cluster-ndbmtd-process"/>.
           </para>
 
         </formalpara>


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 731 bytes

@@ -248,6 +248,7 @@
 	../mysql-monitor-2.0/../common/phrases.ent \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor-versions.xml \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor.xml \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-01-09 18:57:39 UTC (rev 13077)
+++ trunk/refman-6.0/Makefile.depends	2009-01-09 19:05:19 UTC (rev 13078)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 1; 1533 bytes

@@ -1168,7 +1168,6 @@
 	../refman-6.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-6.0/metadata/errors-problems.idmap \
 	../refman-6.0/metadata/programs-using.idmap \
-	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/se-innodb-core.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \

@@ -1610,6 +1609,7 @@
 	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../mysql-monitor-2.0/../common/fixedchars.ent \
 	../mysql-monitor-2.0/../common/phrases.ent \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \

@@ -2217,6 +2217,7 @@
 	../mysql-monitor-2.0/../common/phrases.ent \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor-versions.xml \
 	../mysql-monitor-2.0/../dynamic-docs/changelog/monitor.xml \
+	../mysql-monitor-2.0/../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-configure.xml \
 	../mysql-monitor-2.0/../mysql-monitor-2.0/dashboard-events.xml \