MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:jon Date:July 21 2005 8:45am
Subject:bk commit - mysqldoc@docsrva tree (jon:1.3098)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon 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.3098 05/07/21 18:44:59 jon@stripped +1 -0
  More edits to Cluster chapter for RefMan-5.0.

  refman-5.0/ndbcluster.xml
    1.17 05/07/21 18:44:58 jon@stripped +373 -382
    More RefMan-5.0 edits.

# 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:	jon
# Host:	gigan.
# Root:	/home/jon/bk/mysqldoc

--- 1.16/refman-5.0/ndbcluster.xml	2005-07-21 13:13:28 +10:00
+++ 1.17/refman-5.0/ndbcluster.xml	2005-07-21 18:44:58 +10:00
@@ -798,7 +798,10 @@
             MySQL server on this host (the machine hosting the data
             node) to run in NDB mode.
           </para>
-
+<!-- 
+     TODO: Would "connection string" be a better choice than 
+     "connectstring"?  
+-->
           <para>
             For more information on connectstrings, see
             <xref linkend="mysql-cluster-connectstring"/>.
@@ -971,7 +974,7 @@
             On the management host, issue the following command from the
             system shell to start the MGM node process:
           </para>
-
+<!--  TODO: List switches for clients.  -->
 <programlisting>
   shell&gt; ndb_mgmd -f /var/lib/mysql-cluster/config.ini
 </programlisting>
@@ -1027,7 +1030,9 @@
         invoking the <command>ndb_mgm</command> management node client;
         the output should look like what is shown below:
       </para>
-
+<!--  
+      TODO: Get Jeb or Tomas to provide this output from a 5.0.x build.
+-->
 <programlisting>
 shell&gt; ndb_mgm
 -- NDB Cluster -- Management Client --
@@ -1050,7 +1055,7 @@
         You may see some slight differences depending upon the exact
         version of MySQL that you are using.
       </para>
-
+<!--  TODO: Is this still the case? -->
       <para>
         <emphasis role="bold">Note</emphasis>: If you are using an older
         version of MySQL, you may see the SQL node referenced as
@@ -1077,7 +1082,10 @@
       </para>
 
       <itemizedlist>
-
+<!--  
+      TODO: Look into changing this example to use new sample DB once 
+      MikeH has it ready.
+-->
         <listitem>
           <para>
             Tables must be created with the <option>ENGINE=NDB</option>
@@ -1091,10 +1099,9 @@
             existing <literal>ENGINE</literal> (or
             <literal>TYPE</literal>) option(s) with one of these. For
             example, suppose that you have the sample
-            <emphasis role="bold">world</emphasis> database on another
-            MySQL server (that doesn't support MySQL Cluster), and you
-            wish to export the definition for the
-            <literal>CITY</literal> table:
+            <literal>world</literal> database on another MySQL server 
+            (that does not support MySQL Cluster), and you wish to 
+            export the definition for the <literal>City</literal> table:
           </para>
 
 <programlisting>
@@ -1131,8 +1138,8 @@
             accomplished. One of these is,
             <emphasis role="bold">before</emphasis> importing the table
             into the Cluster database, to modify its definition so that
-            it reads (still using the
-            <emphasis role="bold">City</emphasis> as an example):
+            it reads (still using <literal>City</literal> as an 
+            example):
           </para>
 
 <programlisting>
@@ -1151,7 +1158,9 @@
   INSERT INTO City VALUES (3,'Herat','AFG','Herat',186800);
   # (etc.)
 </programlisting>
-
+<!--  
+      TODO: Should we be using <literal/> or <option/> for such cases?  
+-->
           <para>
             This will need to be done for the definition of each table
             that is to be part of the clustered database. The easiest
@@ -1165,11 +1174,11 @@
 
           <para>
             Assuming that you have already created a database named
-            <emphasis role="bold">world</emphasis> on the SQL node of
-            the cluster, you can then use the <command>mysql</command>
-            command-line client to read
-            <filename>city_table.sql</filename>, and create and populate
-            the corresponding table in the usual manner:
+            <literal>world</literal> on the SQL node of the cluster, you 
+            can then use the <command>mysql</command> command-line 
+            client to read <filename>city_table.sql</filename>, and 
+            create and populate the corresponding table in the usual 
+            manner:
           </para>
 
 <programlisting>
@@ -1184,9 +1193,8 @@
           </para>
 
           <para>
-            To create a copy of the
-            <emphasis role="bold">world</emphasis> database on the SQL
-            node, save the file to
+            To create a copy of the <literal>world</literal> database on 
+            the SQL node, save the file to 
             <filename>/usr/local/mysql/data</filename>, then run
           </para>
 
@@ -1197,22 +1205,22 @@
 
           <para>
             Of course, the SQL script must be readable by the
-            <emphasis role="bold">mysql</emphasis> user. If you save the
-            file to a different location, adjust the above accordingly.
+            <literal>mysql</literal> system user. If you save the file 
+            to a different location, adjust the above accordingly.
           </para>
 
           <para>
-            It is important to note that NDB Cluster in MySQL 4.1 and
-            MySQL 5.0 does not support autodiscovery of databases. (See
+            It is important to note that NDB Cluster in MySQL 5.0 does 
+            not support autodiscovery of databases. (See 
             <xref linkend="mysql-cluster-limitations-in-4-1"/>.) This
-            means that, once the <emphasis role="bold">world</emphasis>
-            database and its tables have been created on one data
-            node,you will need to issue the command <command>CREATE
-            DATABASE world;</command> (beginning with MySQL 5.0.2, you
-            may use <command>CREATE SCHEMA world;</command> instead)
-            followed by <command>FLUSH TABLES;</command> on each data
-            node in the cluster. This will cause the node to recognise
-            the database and read its table definitions.
+            means that, once the <literal>world</literal> database and 
+            its tables have been created on one data node, you will need 
+            to issue the command <command>CREATE DATABASE 
+            world;</command> (beginning with MySQL 5.0.2, you may use 
+            <command>CREATE SCHEMA world;</command> instead), followed 
+            by <command>FLUSH TABLES;</command> on each data node in the 
+            cluster. This will cause the node to recognise the database 
+            and read its table definitions.
           </para>
 
           <para>
@@ -1247,10 +1255,11 @@
 </programlisting>
 
           <para>
-            Note that we simply use the default root account with its
-            empty password here. Of course, in a production setting, you
-            should <emphasis role="bold">always</emphasis> follow the
-            standard security precautions for installing a MySQL server,
+            Note that we simply use the MySQL server's default 
+            <literal>root</literal> account with its empty password 
+            here. Of course, in a production setting, you should 
+            <emphasis role="bold">always</emphasis> follow the standard 
+            security precautions for installing a MySQL server, 
             including the setting of a strong root password and creation
             of a user account with only those privileges required to
             accomplish the tasks necessary for that user. For more
@@ -1262,8 +1271,9 @@
             It is worth taking into account that Cluster nodes do not
             make use of the MySQL privileges system when accessing one
             another, and setting or changing MySQL user accounts
-            (including the root account) has no effect on interaction
-            between nodes, only on applications accessing the SQL node.
+            (including the <literal>root</literal> account) has no 
+            effect on interaction between nodes, only on applications 
+            accessing the SQL node.
           </para>
 
           <para>
@@ -1280,7 +1290,7 @@
   +-----------+------------+
   | Bombay    |   10500000 |
   | Seoul     |    9981619 |
-  | São Paulo |    9968485 |
+  | São Paulo |    9968485 |
   | Shanghai  |    9696300 |
   | Jakarta   |    9604900 |
   +-----------+------------+
@@ -1302,61 +1312,61 @@
           </para>
 
 <programlisting>
-  &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd"&gt;
-  &lt;html&gt;
-  &lt;head&gt;
-    &lt;meta http-equiv="Content-Type"
-          content="text/html; charset=iso-8859-1"&gt;
-    &lt;title&gt;SIMPLE mysqli SELECT&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-  &lt;?php
-    # connect to SQL node:
-    $link = new mysqli('192.168.0.20', 'root', '', 'world');
-    # parameters for mysqli constructor are:
-    #   host, user, password, database
-
-    if( mysqli_connect_errno() )
-      die("Connect failed: " . mysqli_connect_error());
-
-    $query = "SELECT Name, Population
-              FROM City
-              ORDER BY Population DESC
-              LIMIT 5";
-
-    # if no errors...
-    if( $result = $link-&gt;query($query) )
-    {
-  ?&gt;
-  &lt;table border="1" width="40%" cellpadding="4" cellspacing ="1"&gt;
-    &lt;tbody&gt;
-    &lt;tr&gt;
-      &lt;th width="10%"&gt;City&lt;/th&gt;
-      &lt;th&gt;Population&lt;/th&gt;
-    &lt;/tr&gt;
-  &lt;?
-      # then display the results...
-      while($row = $result-&gt;fetch_object())
-        printf(&lt;tr&gt;\n  &lt;td align=\"center\"&gt;%s&lt;/td&gt;&lt;td&gt;%d&lt;/td&gt;\n&lt;/tr&gt;\n",
-                $row-&gt;Name, $row-&gt;Population);
-  ?&gt;
-    &lt;/tbody
-  &lt;/table&gt;
-  &lt;?
-    # ...and verify the number of rows that were retrieved
-      printf("&lt;p&gt;Affected rows: %d&lt;/p&gt;\n", $link-&gt;affected_rows);
-    }
-    else
-      # otherwise, tell us what went wrong
-      echo mysqli_error();
-
-    # free the result set and the mysqli connection object
-    $result-&gt;close();
-    $link-&gt;close();
-  ?&gt;
-  &lt;/body&gt;
-  &lt;/html&gt;
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd"&gt;
+&lt;html&gt;
+&lt;head&gt;
+  &lt;meta http-equiv="Content-Type"
+        content="text/html; charset=iso-8859-1"&gt;
+  &lt;title&gt;SIMPLE mysqli SELECT&lt;/title&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;?php
+  # connect to SQL node:
+  $link = new mysqli('192.168.0.20', 'root', '', 'world');
+  # parameters for mysqli constructor are:
+  #   host, user, password, database
+
+  if( mysqli_connect_errno() )
+    die("Connect failed: " . mysqli_connect_error());
+
+  $query = "SELECT Name, Population
+            FROM City
+            ORDER BY Population DESC
+            LIMIT 5";
+
+  # if no errors...
+  if( $result = $link-&gt;query($query) )
+  {
+?&gt;
+&lt;table border="1" width="40%" cellpadding="4" cellspacing ="1"&gt;
+  &lt;tbody&gt;
+  &lt;tr&gt;
+    &lt;th width="10%"&gt;City&lt;/th&gt;
+    &lt;th&gt;Population&lt;/th&gt;
+  &lt;/tr&gt;
+&lt;?
+    # then display the results...
+    while($row = $result-&gt;fetch_object())
+      printf(&lt;tr&gt;\n  &lt;td align=\"center\"&gt;%s&lt;/td&gt;&lt;td&gt;%d&lt;/td&gt;\n&lt;/tr&gt;\n",
+              $row-&gt;Name, $row-&gt;Population);
+?&gt;
+  &lt;/tbody
+&lt;/table&gt;
+&lt;?
+  # ...and verify the number of rows that were retrieved
+    printf("&lt;p&gt;Affected rows: %d&lt;/p&gt;\n", $link-&gt;affected_rows);
+  }
+  else
+    # otherwise, tell us what went wrong
+    echo mysqli_error();
+
+  # free the result set and the mysqli connection object
+  $result-&gt;close();
+  $link-&gt;close();
+?&gt;
+&lt;/body&gt;
+&lt;/html&gt;
 </programlisting>
 
           <para>
@@ -1366,22 +1376,23 @@
 
           <para>
             In a similar fashion, you can use the MySQL C API, Perl-DBI,
-            Python-mysql, or MySQL AB's Connectors to perform the tasks
-            of data definition and manipulation just as you would
+            Python-mysql, or MySQL AB's own Connectors to perform the 
+            tasks of data definition and manipulation just as you would
             normally with MySQL.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Also remember that all NDB tables must have a primary key.
-            If no primary key is defined by the user when a table is
-            created, the NDB Cluster storage engine will automatically
-            generate a hidden one.
+            Also remember that <emphasis>each <literal>NDB</literal> 
+            table must have a primary key</emphasis>. If no primary key 
+            is defined by the user when a table is created, the 
+            <literal>NDB Cluster</literal> storage engine will 
+            automatically generate a hidden one.
             (<emphasis role="bold">Note</emphasis>: This hidden key
             takes up space just as does any other table index. It is not
-            uncommon to encounter problems due to insufficient memory to
-            accommodate these automatically created keys.)
+            uncommon to encounter problems due to insufficient memory 
+            for accommodating these automatically created keys.)
           </para>
         </listitem>
 
@@ -1424,7 +1435,8 @@
 
         <listitem>
           <para>
-            On the management host (192.168.0.10 in our setup):
+            On the management host (<literal>192.168.0.10</literal> in 
+            our setup):
           </para>
 
 <programlisting>
@@ -1434,8 +1446,9 @@
 
         <listitem>
           <para>
-            On each of the data node hosts (192.168.0.30 and
-            192.168.0.40):
+            On each of the data node hosts 
+            (<literal>192.168.0.30</literal> and 
+            <literal>192.168.0.40</literal>):
           </para>
 
 <programlisting>
@@ -1451,7 +1464,7 @@
 
         <listitem>
           <para>
-            And on the SQL host (192.168.0.20):
+            And on the SQL host (<literal>192.168.0.20</literal>):
           </para>
 
 <programlisting>
@@ -1462,7 +1475,7 @@
       </itemizedlist>
 
       <para>
-        For information on making backups, see
+        For information on making Cluster backups, see
         <xref linkend="mysql-cluster-backup-using-management-server"/>.
       </para>
 
@@ -1488,17 +1501,17 @@
     <para>
       A MySQL server that is part of a MySQL Cluster differs in only one
       respect from a normal (non-clustered) MySQL server, in that it
-      employs the NDB Cluster storage engine. This engine is also
-      referred to simply as <emphasis role="bold">NDB</emphasis>, and
+      employs the <literal>NDB Cluster</literal> storage engine. This 
+      engine is also referred to simply as <literal>NDB</literal>, and
       the two forms of the name are synonomous.
     </para>
 
     <para>
       In order to avoid unnecessary allocation of resources, the server
-      is configured by default with the NDB storage engine disabled. To
-      enable NDB, you will need to modify the server's
-      <filename>my.cnf</filename> configuration file, or start it with
-      the <option>--ndbcluster</option> option.
+      is configured by default with the <literal>NDB</literal> storage 
+      engine disabled. To enable <literal>NDB</literal>, you will need 
+      to modify the server's <filename>my.cnf</filename> configuration 
+      file, or start it with the <option>--ndbcluster</option> option.
     </para>
 
     <para>
@@ -1508,8 +1521,9 @@
       node on <literal>localhost</literal>. However, should you need to
       specify its location elsewhere, this can be done in
       <filename>my.cnf</filename> or on the MySQL server command line.
-      Before the NDB storage engine can be used, at least one MGM node
-      must be operational, as well as any desired data nodes.
+      Before the <literal>NDB</literal> storage engine can be used, at 
+      least one MGM node must be operational, as well as any desired 
+      data nodes.
     </para>
 
     <section id="mysql-cluster-building">
@@ -1517,15 +1531,14 @@
       <title id='title-mysql-cluster-building'>&title-mysql-cluster-building;</title>
 
       <para>
-        <emphasis role="bold">NDB</emphasis>, the Cluster storage
-        engine, is available in binary distributions beginning with
-        MySQL-Max 4.1.3 for Linux, Mac OS X, and Solaris. It is not yet
-        supported on Windows, but we intend to make it available for
-        win32 and other platforms in the near future.
+        <literal>NDB</literal>, the Cluster storage engine, is available 
+        in binary distributions for Linux, Mac OS X, and Solaris. It is 
+        not yet supported on Windows, but we intend to make it available 
+        for win32 and other platforms in the near future.
       </para>
 
       <para>
-        If you choose to build from a source tarball or the MySQL 4.1
+        If you choose to build from a source tarball or the MySQL 5.0
         BitKeeper tree, be sure to use the
         <option>--with-ndbcluster</option> option when running
         <command>configure</command>. You can also use the
@@ -1667,8 +1680,7 @@
 
       <para>
         By default, <command>ndbd</command> will look for the management
-        server at <literal>localhost</literal> on port 1186. (Prior to
-        MySQL 4.1.8, the default port was 2200.)
+        server at <literal>localhost</literal> on port 1186.
       </para>
 
       <para>
@@ -1711,26 +1723,21 @@
         If all has gone well so far, you now can start using the
         cluster:
       </para>
-
+<!--  TODO: Check this against output from an actual 5.0.10 build.  -->
 <programlisting>
 shell&gt; mysql
 Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 1 to server version: 4.1.7
+Your MySQL connection id is 1 to server version: 5.0.10-Max
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
 mysql&gt; SHOW ENGINES;
-+------------+---------+--------------------------------------------------------
-----+
-| Engine     | Support | Comment
-   |
-+------------+---------+--------------------------------------------------------
-----+
++------------+---------+------------------------------------------------------------+
+| Engine     | Support | Comment                                                    |
++------------+---------+------------------------------------------------------------+
 ...
-| NDBCLUSTER | DEFAULT | Clustered, fault-tolerant, memory-based tables
-   |
-| NDB        | YES     | Alias for NDBCLUSTER
-   |
+| NDBCLUSTER | DEFAULT | Clustered, fault-tolerant, memory-based tables             |
+| NDB        | YES     | Alias for NDBCLUSTER                                       |
 ...
 
 mysql&gt; USE test;
@@ -1812,7 +1819,7 @@
             <filename>config.ini</filename>: This file is read only by
             the MySQL Cluster management server, which then distributes
             the information contained in this file to all processes
-            participating in the cluster.
+            participating in the cluster. 
             <filename>config.ini</filename> contains a description of
             each node involved in the cluster. This includes
             configuration parameters for data nodes and configuration
@@ -1840,23 +1847,17 @@
 
         <para>
           In order to support MySQL Cluster, you will need to update
-          <filename>my.cnf</filename> as shown in the example below.
-        </para>
-
-        <para>
-          From version 4.1.8 some simplifications in
-          <filename>my.cnf</filename> were made, including new sections
-          for <literal>ndbcluster</literal> executables. However, these
-          should not be confused with those occurring in
-          <filename>config.ini</filename> files. As always, you may
-          specify these parameters when invoking those executables from
-          the command line.
+          <filename>my.cnf</filename> as shown in the example below. 
+          Note that the options shown here should not be confused with 
+          those occurring in <filename>config.ini</filename> files. You 
+          may also specify these parameters when invoking the 
+          executables from the command line.
         </para>
 
 <programlisting>
 # my.cnf
 # example additions to my.cnf for MySQL Cluster
-# (valid from 4.1.8)
+# (valid in MySQL 5.0)
 
 # enable ndbcluster storage engine, and provide connectstring for
 # management server host (default port is 1186)
@@ -1896,10 +1897,10 @@
 </programlisting>
 
         <para>
-          Also starting with MySQL 4.1.8, the
-          <filename>my.cnf</filename> file supports a separate
-          <literal>[mysql_cluster]</literal> section for settings to be
-          read by and affecting all executables in the cluster:
+          You may also use  a separate 
+          <literal>[mysql_cluster]</literal> section in the cluster
+          <filename>my.cnf</filename> for settings to be read by and 
+          affecting all executables:
         </para>
 
 <programlisting>
@@ -1918,7 +1919,7 @@
           <literal>--config-file=[<replaceable>&lt;path&gt;</replaceable>]<replaceable>&lt;filename&gt;</replaceable></literal>
           on the command line with <command>ndb_mgmd</command>. If the
           configuration file is not specified,
-          <command>ndb_mgmd</command> will by default try to read a
+          <command>ndb_mgmd</command> by default tries to read a
           <filename>config.ini</filename> file located in the current
           working directory.
         </para>
@@ -2011,8 +2012,8 @@
 
           <listitem>
             <para>
-              <literal>[MGM|NDB_MGMD]</literal>: Defines the management
-              server node in the cluster.
+              <literal>[MGM]</literal> or <literal>[NDB_MGMD]</literal>: 
+              Defines the cluster's management server node.
             </para>
           </listitem>
 
@@ -2027,11 +2028,11 @@
           <listitem>
             <para>
               <literal>[SHM]</literal>: Defines shared-memory
-              connections between nodes. Prior to MySQL 4.1.9, this type
-              of connection was available only in binaries that were
+              connections between nodes. Formerly, this type of 
+              connection was available only in binaries that were
               built using the <literal>--with-ndb-shm</literal> option.
-              Beginning with MySQL 4.1.9-max, it is enabled by default,
-              but should still be considered experimental.
+              In MySQL 5.0-Max, it is enabled by default, but should 
+              still be considered experimental.
             </para>
           </listitem>
 
@@ -2045,8 +2046,8 @@
         </para>
 
         <para>
-          One can define <literal>DEFAULT</literal> values for each
-          section. As of MySQL 4.1.5, all parameter names are
+          You can define <literal>DEFAULT</literal> values for each
+          section. In MySQL 5.0, all parameter names are 
           case-insensitive.
         </para>
 
@@ -2060,7 +2061,7 @@
           With the exception of the MySQL Cluster management server
           (<command>ndb_mgmd</command>), each node making up a MySQL
           Cluster requires a
-          <emphasis role="bold">connectstring</emphasis> which points to
+          <firstterm>connectstring</firstterm> which points to
           the management server's location. This is used in establishing
           a connection to the management server as well as in performing
           other tasks depending on the node's role in the cluster. The
@@ -2091,11 +2092,9 @@
           All nodes will use <literal>localhost:1186</literal> as the
           default connectstring value if none is provided. If
           <literal>&lt;port&gt;</literal> is omitted from the
-          connectstring, the default port is 1186.
-          (<emphasis role="bold">Note</emphasis>: Prior to MySQL 4.1.8,
-          the default port was 2200.) This port should always be
-          available on the network, since it has been assigned by IANA
-          for this purpose (see
+          connectstring, the default port is 1186. This port should 
+          always be available on the network, since it has been assigned 
+          by IANA for this purpose (see
           <ulink url="http://www.iana.org/assignments/port-numbers"/>
           for details).
         </para>
@@ -2126,7 +2125,7 @@
 
           <listitem>
             <para>
-              Beginning with MySQL 4.1.8, it is also possible to set the
+              It is also possible in MySQL 5.0 Cluster to set the
               connectstring for all nodes in the cluster at once by
               placing it in a <literal>[mysql_cluster]</literal> section
               in the management server's <filename>my.cnf</filename>
@@ -2138,29 +2137,29 @@
             <para>
               For backwards compatibility, two other options are
               available, using the same syntax:
-            </para>
+              
+              <orderedlist>
 
-            <orderedlist>
-
-              <listitem>
-                <para>
-                  Set the
-
-                  <envar>NDB_CONNECTSTRING</envar>
-
-                  environment variable to contain the connectstring.
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  Write the connectstring for each executable into a
-                  text file named <filename>Ndb.cfg</filename> and place
-                  this file in the executable's startup directory.
-                </para>
-              </listitem>
+                <listitem>
+                  <para>
+                    Set the <envar>NDB_CONNECTSTRING</envar> 
+                    environment variable to contain the connectstring.
+                  </para>
+                </listitem>
+  
+                <listitem>
+                  <para>
+                    Write the connectstring for each executable into a
+                    text file named <filename>Ndb.cfg</filename> and place
+                    this file in the executable's startup directory.
+                  </para>
+                </listitem>
 
-            </orderedlist>
+              </orderedlist>
+              
+              However, these are now deprecated and should not be used 
+              for new installations.
+            </para>
           </listitem>
 
         </itemizedlist>
@@ -2277,6 +2276,7 @@
             </para>
 
             <para>
+              
               <itemizedlist>
 
                 <listitem>
@@ -2563,7 +2563,9 @@
               specifying <literal>ExecuteOnComputer</literal>. It
               defines the hostname of the computer the storage node on
               which is to reside. Either this parameter or
-              <literal>ExecuteOnComputer</literal> is required.
+              <literal>ExecuteOnComputer</literal> is required in order 
+              to specify a hostname other than 
+              <literal>localhost</literal>.
             </para>
           </listitem>
 
@@ -2592,7 +2594,7 @@
               <literal>[NDBD DEFAULT]</literal> section, and defines the
               number of replicas for each table stored in the cluster.
               This parameter also specifies the size of node groups. A
-              node group is a set of nodes that all store the same
+              node group is a set of nodes all storing the same
               information.
             </para>
 
@@ -2699,13 +2701,13 @@
             </para>
 
             <para>
-              This parameter defines the amount of space available to
-              store database records. The entire amount will be
+              This parameter defines the amount of space available for
+              storing database records. The entire amount will be
               allocated in memory, so it is extremely important that the
               machine has sufficient physical memory to accomodate this
               value.
             </para>
-
+<!--  TODO: Is this still correct in 5.0?  -->
             <para>
               The memory allocated by <literal>DataMemory</literal> is
               used to store both the the actual records and indexes.
@@ -2768,9 +2770,7 @@
               applications using the cluster. In any case, performing a
               few large transactions holds no advantage over using many
               smaller ones, for the following reasons:
-            </para>
-
-            <para>
+              
               <itemizedlist>
 
                 <listitem>
@@ -2883,7 +2883,7 @@
               the data in return. They are also used in MySQL Cluster to
               handle uniqueness constraints.
             </para>
-
+<!--  TODO: Still true in 5.0?  -->
             <para>
               Currently the only partitioning algorithm is hashing and
               ordered indexes are local to each node. Thus ordered
@@ -2962,161 +2962,158 @@
           default value. The default value is set for systems using
           small transactions, in order to ensure that these do not use
           excessive memory.
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              <literal>[NDBD]MaxNoOfConcurrentTransactions</literal>
-            </para>
-
-            <para>
-              For each active transaction in the cluster there must be a
-              record in one of the cluster nodes. The task of
-              coordinating transactions is spread amongst the nodes:
-              the total number of transaction records in the cluster is
-              the number of transactions in any given node times the
-              number of nodes in the cluster.
-            </para>
-
-            <para>
-              Transaction records are allocated to individual MySQL
-              servers. Normally there is at least one transaction record
-              allocated per connection that using any table in the
-              cluster. For this reason, one should ensure that there are
-              more transaction records in the cluster than there are
-              concurrent connections to all MySQL servers in the
-              cluster.
-            </para>
-
-            <para>
-              This parameter must be set to the same value for all
-              cluster nodes.
-            </para>
-
-            <para>
-<!--   What does the following really mean? If we shouldn't change this, then why -->
-            </para>
-
-            <para>
-<!--   is there an option to do so? -->
-            </para>
-
-            <para>
-              Changing this parameter is never safe and can cause a
-              cluster to crash. When a node crashes one of the node
-              (actually the oldest surviving node) will build up the
-              transaction state of all transactions ongoing in the
-              crashed node at the time of the crash. It is thus
-              important that this node has as many transaction records
-              as the failed node.
-            </para>
-
-            <para>
-              The default value for this parameter is 4096.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>[NDBD]MaxNoOfConcurrentOperations</literal>
-            </para>
-
-            <para>
-              It is a good idea to adjust the value of this parameter
-              according to the size and number of transactions. When
-              performing transactions of only a few operations each and
-              not involving a great many records, there is no need to
-              set this parameter very high. When performing large
-              transactions involving many records need to set this
-              parameter higher.
-            </para>
 
-            <para>
-              Records are kept for each transaction updating cluster
-              data, both in the transaction co-ordinator and in the
-              nodes where the actual updates are performed. These
-              records contain state information needed in order to find
-              UNDO records for rollback, lock queues, and other
-              purposes.
-            </para>
-
-            <para>
-              This parameter should be set to the number of records to
-              be updated simultaneously in transactions, divided by the
-              number of cluster data nodes. For example, in a cluster
-              which has 4 data nodes and which is expected to handle
-              1,000,000 concurrent updates using transactions, you
-              should set this value to 1000000 / 4 = 250000.
-            </para>
-
-            <para>
-              Read queries which set locks also cause operation records
-              to be created. Some extra space is allocated in the
-              individual nodes to accomodate cases where the
-              distribution is not perfect over the nodes.
-            </para>
-
-            <para>
-              When queries make use of the unique hash index, there are
-              actually two operation records used per record in the
-              transaction. The first record represents the read in the
-              index table and the second handles the operation on the
-              base table.
-            </para>
-
-            <para>
-              The default value for this parameter is 32768.
-            </para>
-
-            <para>
-              This parameter actually handles two values that can be
-              configured separately. The first of these specifies how
-              many operation records are to be placed with the
-              transaction co-ordinator. The second part specifies how
-              many operation records are to be local to the database.
-            </para>
-
-            <para>
-              A very large transaction performed on a 8-node cluster
-              requires as many operation records in the transaction
-              co-ordinator as there are reads, updates, and deletes
-              involved in the transaction. However, the operation
-              records of the are spread over all 8 nodes. Thus, if it is
-              necessary to configure the system for one very large
-              transaction, then it is a good idea to configure the two
-              parts separately.
-              <literal>MaxNoOfConcurrentOperations</literal> will always
-              be used to calculate the number of operation records in
-              the transaction co-ordinator portion of the node.
-            </para>
-
-            <para>
-              It is also important to have an idea of the memory
-              requirements for operation records. In MySQL 4.1, these
-              consume about 1KB per record. This figure is expected to
-              be reduced in MySQL 5.x.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>[NDBD]MaxNoOfLocalOperations</literal>
-            </para>
-
-            <para>
-              By default, this parameter is calculated as 1.1 *
-              <literal>MaxNoOfConcurrentOperations</literal> which fits
-              systems with many simultaneous transactions, none of them
-              being very large. If there is a need to handle one very
-              large transaction at a time and there are many nodes, then
-              it is a good idea to override the default value by
-              explicitly specifying this parameter.
-            </para>
-          </listitem>
+          <itemizedlist>
+  
+            <listitem>
+              <para>
+                <literal>[NDBD]MaxNoOfConcurrentTransactions</literal>
+              </para>
+  
+              <para>
+                For each active transaction in the cluster there must be a
+                record in one of the cluster nodes. The task of
+                coordinating transactions is spread amongst the nodes:
+                the total number of transaction records in the cluster is
+                the number of transactions in any given node times the
+                number of nodes in the cluster.
+              </para>
+  
+              <para>
+                Transaction records are allocated to individual MySQL
+                servers. Normally there is at least one transaction record
+                allocated per connection that using any table in the
+                cluster. For this reason, one should ensure that there are
+                more transaction records in the cluster than there are
+                concurrent connections to all MySQL servers in the
+                cluster.
+              </para>
+  
+              <para>
+                This parameter must be set to the same value for all
+                cluster nodes.
+              </para>
+
+<!--  
+      TODO: What does the following really mean? If we shouldn't change 
+      this, then why is there an option to do so? 
+-->
 
-        </itemizedlist>
+              <para>
+                Changing this parameter is never safe and can cause a
+                cluster to crash. When a node crashes one of the node
+                (actually the oldest surviving node) will build up the
+                transaction state of all transactions ongoing in the
+                crashed node at the time of the crash. It is thus
+                important that this node has as many transaction records
+                as the failed node.
+              </para>
+  
+              <para>
+                The default value for this parameter is 4096.
+              </para>
+            </listitem>
+  
+            <listitem>
+              <para>
+                <literal>[NDBD]MaxNoOfConcurrentOperations</literal>
+              </para>
+  
+              <para>
+                It is a good idea to adjust the value of this parameter
+                according to the size and number of transactions. When
+                performing transactions of only a few operations each and
+                not involving a great many records, there is no need to
+                set this parameter very high. When performing large
+                transactions involving many records need to set this
+                parameter higher.
+              </para>
+  
+              <para>
+                Records are kept for each transaction updating cluster
+                data, both in the transaction co-ordinator and in the
+                nodes where the actual updates are performed. These
+                records contain state information needed in order to find
+                UNDO records for rollback, lock queues, and other
+                purposes.
+              </para>
+  
+              <para>
+                This parameter should be set to the number of records to
+                be updated simultaneously in transactions, divided by the
+                number of cluster data nodes. For example, in a cluster
+                which has 4 data nodes and which is expected to handle
+                1,000,000 concurrent updates using transactions, you
+                should set this value to 1000000 / 4 = 250000.
+              </para>
+  
+              <para>
+                Read queries which set locks also cause operation records
+                to be created. Some extra space is allocated in the
+                individual nodes to accomodate cases where the
+                distribution is not perfect over the nodes.
+              </para>
+  
+              <para>
+                When queries make use of the unique hash index, there are
+                actually two operation records used per record in the
+                transaction. The first record represents the read in the
+                index table and the second handles the operation on the
+                base table.
+              </para>
+  
+              <para>
+                The default value for this parameter is 32768.
+              </para>
+  
+              <para>
+                This parameter actually handles two values that can be
+                configured separately. The first of these specifies how
+                many operation records are to be placed with the
+                transaction co-ordinator. The second part specifies how
+                many operation records are to be local to the database.
+              </para>
+  
+              <para>
+                A very large transaction performed on a 8-node cluster
+                requires as many operation records in the transaction
+                co-ordinator as there are reads, updates, and deletes
+                involved in the transaction. However, the operation
+                records of the are spread over all 8 nodes. Thus, if it is
+                necessary to configure the system for one very large
+                transaction, then it is a good idea to configure the two
+                parts separately.
+                <literal>MaxNoOfConcurrentOperations</literal> will always
+                be used to calculate the number of operation records in
+                the transaction co-ordinator portion of the node.
+              </para>
+  
+              <para>
+                It is also important to have an idea of the memory
+                requirements for operation records. In MySQL 4.1, these
+                consume about 1KB per record. This figure is expected to
+                be reduced in MySQL 5.x.
+              </para>
+            </listitem>
+  
+            <listitem>
+              <para>
+                <literal>[NDBD]MaxNoOfLocalOperations</literal>
+              </para>
+  
+              <para>
+                By default, this parameter is calculated as 1.1 *
+                <literal>MaxNoOfConcurrentOperations</literal> which fits
+                systems with many simultaneous transactions, none of them
+                being very large. If there is a need to handle one very
+                large transaction at a time and there are many nodes, then
+                it is a good idea to override the default value by
+                explicitly specifying this parameter.
+              </para>
+            </listitem>
+  
+          </itemizedlist>
+        </para>
 
         <para>
           <emphasis role="bold">Transaction Temporary Storage</emphasis>
@@ -3370,17 +3367,12 @@
               this chapter.
             </para>
 
-            <para>
-<!--   *** TODO: Get info from NDB-devs for these  *** -->
-            </para>
-
-            <para>
-<!--  How they interact and proposals of how to configure them is -->
-            </para>
-
-            <para>
-<!--  provided in @ref{MySQL Cluster Complex Configuration}. -->
-            </para>
+<!--  
+      TODO: Get info from NDB-devs regarding these -
+      
+      How these interact and proposals for how to configure them are 
+      provided in <xref linkend="MySQL Cluster Complex Configuration"/>. 
+-->
 
             <para>
               The default parameter value is 8, which means 8 sets of 4
@@ -3402,27 +3394,26 @@
               checkpoint has completed and the log tail can be moved
               forward.
             </para>
-
-            <para>
-<!--  @item [NDBD]MaxNoOfOpenFiles -->
-            </para>
-
-            <para>
-<!--  This parameter sets a ceiling to how many internal threads will be allocated -->
-            </para>
-
-            <para>
-<!--  for open files. @emph{Any situation requiring a change in this parameter -->
-            </para>
-
-            <para>
-<!--  should be reported as a bug}. -->
-            </para>
-
-            <para>
-<!--  The default value for this parameter is 40. -->
-            </para>
           </listitem>
+            
+<!--  
+      <listitem>
+        <para>
+          <literal>[NDBD]MaxNoOfOpenFiles</literal>
+        </para>
+        
+        <para>
+          This parameter sets a ceiling on how many internal threads 
+          will be allocated for open files. <emphasis>Any situation 
+          requiring a change in this parameter should be reported as a 
+          bug</emphasis>.  
+        </para>
+        
+        <para>
+          The default value for this parameter is 40.
+        </para>
+      </listitem>
+-->
 
           <listitem>
             <para>
Thread
bk commit - mysqldoc@docsrva tree (jon:1.3098)jon21 Jul