List:Commits« Previous MessageNext Message »
From:jon.stephens Date:April 10 2011 12:49pm
Subject:svn commit - mysqldoc@oter02: r25818 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars dynamic-docs/licenses ndbapi refman-5.0 refman-5....
View as plain text  
Author: js221926
Date: 2011-04-10 14:49:45 +0200 (Sun, 10 Apr 2011)
New Revision: 25818

Log:

Documentation for new features in Cluster-7.2

  SPJ (WL#3258): 
    ndb_join_pushdown system variable 
    Ndb_pushed_* status variables 
    Additions to EXPLAIN output
    Additions to ndbinfo.counters 
    NDBAPI: stub section for new DBSPJ kernel block

  Distributed privileges (WL#5482)

  New defaults for data node configuration parameters (No WL#)

  Started 7.2.0 changelog; added changelog entries 

  Added blurbs for chapter intro; updated Cluster Limitations

  Deployed new 3rd-party licence files for 7.2+

  Updated dependencies




Modified:
   trunk/dynamic-docs/changelog/mysqld-2.xml
   trunk/dynamic-docs/changelog/mysqld-versions.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/dynamic-docs/command-optvars/ndb-config-params.xml
   trunk/dynamic-docs/licenses/products.xml
   trunk/ndbapi/ndb-internals.xml
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/mysql-cluster-configuration-core.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/mysql-cluster-news-core.xml
   trunk/refman-5.1/mysql-cluster-overview.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.5/Makefile.depends
   trunk/refman-5.6/Makefile.depends
   trunk/refman-6.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile.depends


Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 1, Lines Added: 147, Lines Deleted: 0; 5370 bytes

@@ -6,6 +6,153 @@
 ]>
 <changelog>
 
+  <logentry entrytype="feature">
+
+    <tags>
+      <highlight type="cluster"/>
+      <highlight type="importantchange"/>
+      <manual type="privileges"/>
+      <manual type="grant tables"/>
+      <manual type="ndb_dist_priv.sql"/>
+    </tags>
+
+    <bugs>
+      <fixes wlid="5482"/>
+    </bugs>
+
+    <versions>
+      <version ver="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+    <message>
+
+      <para>
+        MySQL user privileges can now be distributed automatically
+        across all MySQL servers (SQL nodes) connected to the same MySQL
+        Cluster. Previously, each MySQL Server&apos;s user privilege
+        tables were required to use the
+        <literal role="se">MyISAM</literal> storage engine, which meant
+        that a user account and its associated privileges created on one
+        SQL node were not available on any other SQL node without manual
+        intervention. MySQL Cluster now provides an SQL script file
+        <filename>ndb_dist_priv.sql</filename> that can be found in
+        <filename>share/mysql</filename> under the MySQL installation
+        directory; loading this script creates a stored procedure
+        <literal>mysql_cluster_move_privileges</literal> that can be
+        used following initial installation to convert the privilege
+        tables to the <literal role="se">NDB</literal> storage engine,
+        so that any time a MySQL user account is created, dropped, or
+        has its privileges updated on any SQL node, the changes take
+        effect immediately on all other MySQL servers attached to the
+        cluster. Note that you may need to execute
+        <literal role="stmt" condition="flush">FLUSH
+        PRIVILEGES</literal> on any SQL nodes with connected MySQL
+        clients (or to disconnect and then reconnect the clients) in
+        order for those clients to be able to see the changes in
+        privileges.
+      </para>
+
+      <para>
+        Once <literal>mysql_cluster_move_privileges</literal> has been
+        executed successfully, all MySQL user privileges are distributed
+        across all connected MySQL Servers. MySQL Servers that join the
+        cluster after this automatically participate in the privilege
+        distribution.
+      </para>
+
+      <para>
+        <filename>ndb_dist_priv.sql</filename> also provides stored
+        routines that can be used to verify that the privilege tables
+        have been distributed successfully, and to perform other tasks.
+      </para>
+
+      <para>
+        For more information, see
+        <xref linkend="mysql-cluster-privilege-distribution"/>.
+      </para>
+
+    </message>
+
+  </logentry>
+
+  <logentry entrytype="feature">
+
+    <tags>
+      <highlight type="cluster"/>
+      <highlight type="importantchange"/>
+      <manual type="configuration"/>
+    </tags>
+
+    <versions>
+      <version ver="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+    <message>
+
+      <para>
+        The default values for a number of MySQL Cluster data node
+        configuration parameters have changed, in order to provide more
+        resiliency to environmental issues and better handling of some
+        potential failure scenarios, and to perform more reliably with
+        increases in memory and other resource requirements brought
+        about by recent improvements in join handling by
+        <literal role="se">NDB</literal>. The affected parameters are
+        listed here:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <literal role="ndbparam:ndbd">HeartbeatIntervalDbDb</literal>:
+            Default increased from 1500 ms to 5000 ms.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal role="ndbparam:ndbd">ArbitrationTimeout</literal>:
+            Default increased from 3000 ms to 7500 ms.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal role="ndbparam:ndbd">TimeBetweenEpochsTimeout</literal>:
+            Now effectively disabled by default (default changed from
+            4000 ms to 0).
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal role="ndbparam:ndbd">SharedGlobalMemory</literal>:
+            Default increased from 20 MB to 128 MB.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal role="ndbparam:ndbd">MaxParallelScansPerFragment</literal>:
+            Default increased from 32 to 256.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <para>
+        In addition, when
+        <literal role="ndbparam:ndbd">MaxNoOfLocalScans</literal> is not
+        specified, the value computed for it automatically has been
+        increased by a factor of 4 (that is, to 4 times
+        <literal role="ndbparam:ndbd">MaxNoOfConcurrentScans</literal>,
+        times the number of data nodes in the cluster).
+      </para>
+
+    </message>
+
+  </logentry>
+
   <logentry entrytype="custom" customname="cl-innodb-persistent-stats" customtitle="Persistent InnoDB Optimizer Statistics">
 
     <tags>


Modified: trunk/dynamic-docs/changelog/mysqld-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-versions.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/dynamic-docs/changelog/mysqld-versions.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 896 bytes

@@ -138,6 +138,7 @@
   <versionentry ver="5.1.53" reldate="03 November 2010"/>
   <versionentry ver="5.1.52sp1" versiontag="es" package="qsp" reldate="21 February 2011" cloneoffdate="02 February 2011"/>
   <versionentry ver="5.1.52" reldate="11 October 2010"/>
+  <versionentry ver="5.1.51" subver="ndb-7.2.0" rellevel="Development Milestone" reldate="11 April 2011"/>
   <versionentry ver="5.1.51" subver="ndb-7.1.13" reldate="Not yet released"/>
   <versionentry ver="5.1.51" subver="ndb-7.1.12" reldate="04 April 2011"/>
   <versionentry ver="5.1.51" subver="ndb-7.1.11" reldate="25 February 2011"/>


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 3, Lines Added: 129, Lines Deleted: 2; 3969 bytes

@@ -13415,8 +13415,8 @@
 
     <shortdescription>
       Specifies whether the InnoDB purge operation should be performed
-      in one or more separate threads. By default, this operation is part of the
-      InnoDB master thread.
+      in one or more separate threads. By default, this operation is
+      part of the InnoDB master thread.
     </shortdescription>
 
     <types>

@@ -18112,6 +18112,31 @@
 
   </mysqloption>
 
+  <mysqloption section="ndb" id="ndb_join_pushdown">
+
+    <xrefto id="sysvar_ndb_join_pushdown"/>
+
+    <name>ndb_join_pushdown</name>
+
+    <shortdescription>
+      Enables pushing down of joins to data nodes
+    </shortdescription>
+
+    <types>
+      <vartype scope="global" class="system" isdynamic="no"/>
+    </types>
+
+    <values vartype="boolean" platform="all" inversion="5.1.51-ndb-7.2.0">
+      <value default="TRUE"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="ndb" id="ndb_execute_count">
 
     <xrefto id="statvar_Ndb_execute_count"/>

@@ -18503,6 +18528,108 @@
 
   </mysqloption>
 
+  <mysqloption section="ndb" id="ndb_pushed_reads">
+
+    <xrefto id="statvar_Ndb_pushed_reads"/>
+
+    <name>Ndb_pushed_reads</name>
+
+    <shortdescription>
+      Number of reads executed on the data nodes by pushed-down joins
+    </shortdescription>
+
+    <types>
+      <vartype scope="global" class="status" isdynamic="no" format="Ndb_pushed_reads"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="0"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="ndb" id="ndb_pushed_queries_defined">
+
+    <xrefto id="statvar_Ndb_queries_defined"/>
+
+    <name>Ndb_pushed_queries_defined</name>
+
+    <shortdescription>
+      Number of joins that API nodes have attempted to push down to the
+      data nodes
+    </shortdescription>
+
+    <types>
+      <vartype scope="global" class="status" isdynamic="no" format="Ndb_pushed_queries_defined"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="0"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="ndb" id="ndb_pushed_queries_dropped">
+
+    <xrefto id="statvar_Ndb_queries_dropped"/>
+
+    <name>Ndb_pushed_queries_dropped</name>
+
+    <shortdescription>
+      Number of joins that API nodes have tried to push down, but failed
+    </shortdescription>
+
+    <types>
+      <vartype scope="global" class="status" isdynamic="no" format="Ndb_pushed_queries_dropped"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="0"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="ndb" id="ndb_pushed_queries_executed">
+
+    <xrefto id="statvar_Ndb_queries_executed"/>
+
+    <name>Ndb_pushed_queries_executed</name>
+
+    <shortdescription>
+      Number of joins successfully pushed down and executed on the data
+      nodes
+    </shortdescription>
+
+    <types>
+      <vartype scope="global" class="status" isdynamic="no" format="Ndb_pushed_queries_executed"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="0"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.51-ndb-7.2.0"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="ndb" id="ndb-nodeid">
 
     <xrefto id="option_mysqld_ndb-nodeid"/>


Modified: trunk/dynamic-docs/command-optvars/ndb-config-params.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/ndb-config-params.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/dynamic-docs/command-optvars/ndb-config-params.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 5, Lines Added: 21, Lines Deleted: 2; 2225 bytes

@@ -252,6 +252,10 @@
       <value default="3000" minimum="10" maximum="4G"/>
     </values>
 
+    <values vartype="numeric" platform="all" inversion="5.1.51-ndb-7.2.0" units="milliseconds">
+      <value default="7500" minimum="10" maximum="4G"/>
+    </values>
+
     <versions>
       <manual version="4.1"/>
       <introduced version="4.1.3"/>

@@ -1311,6 +1315,10 @@
       <value default="1500" minimum="10" maximum="4G"/>
     </values>
 
+    <values vartype="numeric" platform="all" inversion="5.1.51-ndb-7.2.0" units="milliseconds">
+      <value default="5000" minimum="10" maximum="4G"/>
+    </values>
+
     <versions>
       <manual version="4.1"/>
       <introduced version="4.1.3"/>

@@ -2811,10 +2819,13 @@
       <value default="32" minimum="1" maximum="1G"/>
     </values>
 
+    <values vartype="numeric" platform="all" units="bytes" inversion="5.1.51-ndb-7.2.0">
+      <value default="256" minimum="1" maximum="1G"/>
+    </values>
+
     <versions>
       <manual version="5.1"/>
-      <introduced version="5.1.51-ndb-7.0.23"/>
-      <introduced version="5.1.51-ndb-7.1.21"/>
+      <introduced version="5.1.51-ndb-7.0.23, 5.1.51-ndb-7.1.21"/>
     </versions>
 
     <restart type="node" initial="no"/>

@@ -4324,6 +4335,10 @@
       <value default="20M" minimum="0" maximum="64T"/>
     </values>
 
+    <values vartype="numeric" platform="all" units="bytes" inversion="5.1.51-ndb-7.2.0">
+      <value default="128M" minimum="0" maximum="64T"/>
+    </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.6"/>

@@ -4796,6 +4811,10 @@
       <value default="4000" minimum="0" maximum="256000"/>
     </values>
 
+    <values vartype="numeric" platform="all" units="milliseconds" inversion="5.1.51-ndb-7.2.0">
+      <value default="0" minimum="0" maximum="256000"/>
+    </values>
+
     <versions>
       <manual version="5.1"/>
       <introduced version="5.1.22-ndb-6.2.7, 5.1.22-ndb-6.3.4"/>


Modified: trunk/dynamic-docs/licenses/products.xml
===================================================================
--- trunk/dynamic-docs/licenses/products.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/dynamic-docs/licenses/products.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 12; 1283 bytes

@@ -450,10 +450,6 @@
     </product>
 
     <product id="cluster">
-<!--
-      [js] NOTE: Google TCMalloc, Linux-PAM, and OpenPAM licenses for Cluster
-      7.2 commented out until we have a Cluster 7.2 product and documentation.
--->
       <use id="license-antlr-3"/>
       <use id="license-dbug"/>
       <use id="license-dtoa"/>

@@ -464,24 +460,16 @@
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>
-<!--      
       <use id="license-google-tcmalloc"/>
--->
       <use id="license-libedit"/>
       <use id="license-libevent"/>
       <use id="license-libstring"/>
       <use id="license-lib-sql"/>
-<!--      
       <use id="license-linux-pam"/>
--->
       <use id="license-md5"/>
-<!--      
       <use id="license-memcached"/>
--->
       <use id="license-nt-servc"/>
-<!--      
       <use id="license-openpam"/>
--->
       <use id="license-percona-io-threads-patch"/>
       <use id="license-regex"/>
       <use id="license-sha1-in-c"/>


Modified: trunk/ndbapi/ndb-internals.xml
===================================================================
--- trunk/ndbapi/ndb-internals.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/ndbapi/ndb-internals.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 3, Lines Added: 64, Lines Deleted: 3; 2830 bytes

@@ -9810,7 +9810,7 @@
 
         <listitem>
           <para>
-            <filename>LCP.txt</filename>: Contains developer noted about
+            <filename>LCP.txt</filename>: Contains developer notes about
             the exchange of messages between <literal>DIH</literal> and
             <literal>LQH</literal> that takes place during a local
             checkpoint.

@@ -9852,9 +9852,70 @@
 
     </section>
 
+    <section id="ndb-internals-kernel-blocks-dbspj">
+
+      <title>The <literal>DBSPJ</literal> Block</title>
+
+      <para>
+        This block, added in MySQL Cluster NDB 7.2, implements multiple
+        cursors in the NDB kernel, providing handling for joins pushed
+        down from SQL nodes. It contains the following files, which can
+        be found in the directory
+        <filename>storage/ndb/src/kernel/blocks/dbspj</filename>:
+      </para>
+
+      <remark role="todo">
+        [js] Flesh out info in list; add description for DbspjProxy
+      </remark>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <filename>Dbspj.hpp</filename>: Defines the
+            <literal>Dbspj</literal> class.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <filename>DbspjInit.cpp</filename>: <literal>Dbspj</literal>
+            initialization.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <filename>DbspjMain.cpp</filename>: Handles conditions
+            pushed down from API and signal passing between
+            <literal>DBSPJ</literal> and the <literal>DBLQH</literal>
+            and <literal>DBTC</literal> kernel blocks.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <filename>DbspjProxy.cpp</filename>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <filename>DbspjProxy.cpp</filename>
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      <remark role="todo">
+        [js] Flesh out info in list; add description for DbspjProxy
+      </remark>
+
+    </section>
+
     <section id="ndb-internals-kernel-blocks-dblqh">
 
-      <title><literal>DBLQH</literal> Block</title>
+      <title>The <literal>DBLQH</literal> Block</title>
 
       <para>
         This is the local, low-level query handler block, which manages

@@ -10728,7 +10789,7 @@
 
     <section id="ndb-internals-kernel-blocks-dbtux">
 
-      <title><literal>DBTUX</literal> Block</title>
+      <title>The <literal>DBTUX</literal> Block</title>
 
       <para>
         This kernel block handles the local management of ordered


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.0/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 18, Lines Added: 14, Lines Deleted: 514; 27899 bytes

@@ -1653,29 +1653,7 @@
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1792,77 +1770,7 @@
 	versions.ent
 dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -1979,40 +1887,7 @@
 	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2129,22 +2004,7 @@
 	versions.ent
 dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2261,12 +2121,7 @@
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2383,11 +2238,7 @@
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2504,25 +2355,7 @@
 	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2639,79 +2472,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -2828,41 +2589,7 @@
 	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -2979,24 +2706,7 @@
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3113,19 +2823,7 @@
 	versions.ent
 dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3242,68 +2940,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3420,56 +3057,7 @@
 	versions.ent
 dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -3586,90 +3174,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-outline.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -5999,7 +5504,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6012,10 +5516,8 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \

@@ -6036,7 +5538,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-es.idmap \

@@ -6082,7 +5583,6 @@
 	metadata/restrictions.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
 	metadata/se-csv.idmap \
 	metadata/se-example.idmap \
 	metadata/se-federated.idmap \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 21, Lines Added: 26, Lines Deleted: 554; 32428 bytes

@@ -1754,15 +1754,18 @@
 	../common/license-gnu-readline.xml \
 	../common/license-google-io-rate-patch.xml \
 	../common/license-google-smp-patch.xml \
+	../common/license-google-tcmalloc.xml \
 	../common/license-lib-sql.xml \
 	../common/license-libedit.xml \
 	../common/license-libevent.xml \
 	../common/license-libstring.xml \
+	../common/license-linux-pam.xml \
 	../common/license-lpeg.xml \
 	../common/license-lua.xml \
 	../common/license-luafilesystem.xml \
 	../common/license-md5.xml \
 	../common/license-nt-servc.xml \
+	../common/license-openpam.xml \
 	../common/license-pcre.xml \
 	../common/license-percona-io-threads-patch.xml \
 	../common/license-regex.xml \

@@ -1798,15 +1801,18 @@
 	../common/metadata/license-gnu-readline.idmap \
 	../common/metadata/license-google-io-rate-patch.idmap \
 	../common/metadata/license-google-smp-patch.idmap \
+	../common/metadata/license-google-tcmalloc.idmap \
 	../common/metadata/license-lib-sql.idmap \
 	../common/metadata/license-libedit.idmap \
 	../common/metadata/license-libevent.idmap \
 	../common/metadata/license-libstring.idmap \
+	../common/metadata/license-linux-pam.idmap \
 	../common/metadata/license-lpeg.idmap \
 	../common/metadata/license-lua.idmap \
 	../common/metadata/license-luafilesystem.idmap \
 	../common/metadata/license-md5.idmap \
 	../common/metadata/license-nt-servc.idmap \
+	../common/metadata/license-openpam.idmap \
 	../common/metadata/license-pcre.idmap \
 	../common/metadata/license-percona-io-threads-patch.idmap \
 	../common/metadata/license-regex.idmap \

@@ -1942,30 +1948,7 @@
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -2093,86 +2076,7 @@
 	versions.ent
 dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2300,43 +2204,7 @@
 	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2464,25 +2332,7 @@
 	versions.ent
 dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2610,13 +2460,7 @@
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2744,11 +2588,7 @@
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2876,26 +2716,7 @@
 	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -3023,86 +2844,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3230,43 +2972,7 @@
 	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3394,26 +3100,7 @@
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3541,21 +3228,7 @@
 	versions.ent
 dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3683,69 +3356,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3873,57 +3484,7 @@
 	versions.ent
 dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -4051,98 +3612,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -6408,15 +5878,18 @@
 	../common/license-gnu-readline.xml \
 	../common/license-google-io-rate-patch.xml \
 	../common/license-google-smp-patch.xml \
+	../common/license-google-tcmalloc.xml \
 	../common/license-lib-sql.xml \
 	../common/license-libedit.xml \
 	../common/license-libevent.xml \
 	../common/license-libstring.xml \
+	../common/license-linux-pam.xml \
 	../common/license-lpeg.xml \
 	../common/license-lua.xml \
 	../common/license-luafilesystem.xml \
 	../common/license-md5.xml \
 	../common/license-nt-servc.xml \
+	../common/license-openpam.xml \
 	../common/license-pcre.xml \
 	../common/license-percona-io-threads-patch.xml \
 	../common/license-regex.xml \

@@ -7181,15 +6654,18 @@
 	../common/metadata/license-gnu-readline.idmap \
 	../common/metadata/license-google-io-rate-patch.idmap \
 	../common/metadata/license-google-smp-patch.idmap \
+	../common/metadata/license-google-tcmalloc.idmap \
 	../common/metadata/license-lib-sql.idmap \
 	../common/metadata/license-libedit.idmap \
 	../common/metadata/license-libevent.idmap \
 	../common/metadata/license-libstring.idmap \
+	../common/metadata/license-linux-pam.idmap \
 	../common/metadata/license-lpeg.idmap \
 	../common/metadata/license-lua.idmap \
 	../common/metadata/license-luafilesystem.idmap \
 	../common/metadata/license-md5.idmap \
 	../common/metadata/license-nt-servc.idmap \
+	../common/metadata/license-openpam.idmap \
 	../common/metadata/license-pcre.idmap \
 	../common/metadata/license-percona-io-threads-patch.idmap \
 	../common/metadata/license-regex.idmap \

@@ -7258,7 +6734,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -7271,11 +6746,9 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \

@@ -7297,7 +6770,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \
 	metadata/installing-envvar.idmap \


Modified: trunk/refman-5.1/mysql-cluster-configuration-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration-core.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/mysql-cluster-configuration-core.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 8, Lines Added: 277, Lines Deleted: 20; 13927 bytes

@@ -3283,11 +3283,14 @@
 
           <para>
             Specifies the number of local scan records if many scans are
-            not fully parallelized. If the number of local scan records
-            is not provided, it is calculated as the product of
+            not fully parallelized. In MySQL Cluster NDB 7.2.0 and
+            later, when the number of local scan records is not
+            provided, it is calculated as 4 times the product of
             <literal role="ndbparam:ndbd">MaxNoOfConcurrentScans</literal>
-            and the number of data nodes in the system. The minimum
-            value is 32.
+            and the number of data nodes in the system. (Previously, it
+            was calculated as the product of
+            <literal role="ndbparam:ndbd">MaxNoOfConcurrentScans</literal>
+            and the number of data nodes.) The minimum value is 32.
           </para>
         </listitem>
 

@@ -3362,14 +3365,16 @@
             NDB 7.1.12, it is possible to copnfigure the maximum number
             of parallel scans (<literal>TUP</literal> scans and
             <literal>TUX</literal> scans) allowed before they begin
-            queuing for serial handling. You can increase this to take
-            advantage of any unused CPU when performing large number of
-            scans in parallel and improve their performance.
+            queuing for serial handling. (Previously, the maximum number
+            of parallel scans per fragment was fixed at 32.) You can
+            increase this to take advantage of any unused CPU when
+            performing large number of scans in parallel and improve
+            their performance.
           </para>
 
           <para>
-            Previously, the maximum number of parallel scans per
-            fragment was fixed at 32.
+            Beginning with MySQL Cluster NDB 7.2.0, the default value
+            for this parameter is increased from 32 to 256.
           </para>
         </listitem>
 

@@ -4561,13 +4566,15 @@
           </para>
 
           <para>
-            The default heartbeat interval is 1500 milliseconds (1.5
-            seconds). This parameter must not be changed drastically and
-            should not vary widely between nodes. If one node uses 5000
-            milliseconds and the node watching it uses 1000
-            milliseconds, obviously the node will be declared dead very
-            quickly. This parameter can be changed during an online
-            software upgrade, but only in small increments.
+            In MySQL Cluster NDB 7.2.0 and later, the default heartbeat
+            interval is 5000 milliseconds (5 seconds). Previously, the
+            default was 1500 milliseconds (1.5 seconds). This parameter
+            must not be changed drastically and should not vary widely
+            between nodes. If one node uses 5000 milliseconds and the
+            node watching it uses 1000 milliseconds, obviously the node
+            will be declared dead very quickly. This parameter can be
+            changed during an online software upgrade, but only in small
+            increments.
           </para>
         </listitem>
 

@@ -4911,8 +4918,11 @@
             This parameter defines a timeout for synchronization epochs
             for MySQL Cluster Replication. If a node fails to
             participate in a global checkpoint within the time
-            determined by this parameter, the node is shut down. The
-            default value is 4000 milliseconds.
+            determined by this parameter, the node is shut down. In
+            MySQL Cluster NDB 7.2.0 and later, the default value is 0;
+            in other words, the timeout is disabled. This represents a
+            change from previous versions of MySQL Cluster, in which the
+            default value was 4000 milliseconds (4 seconds).
           </para>
 
           <para>

@@ -5402,7 +5412,9 @@
           </para>
 
           <para>
-            The default value is 1000 milliseconds (1 second).
+            In MySQL Cluster NDB 7.2.0 and later, the default value is
+            7500 milliseconds (7.5 seconds). Previously, this was 3000
+            milliseconds (3 seconds).
           </para>
         </listitem>
 

@@ -6640,7 +6652,9 @@
           </para>
 
           <para>
-            The default value is <literal>20M</literal>.
+            As of MySQL Cluster NDB 7.2.0, the default value is
+            <literal>128M</literal>. (Previously, this was
+            <literal>20M</literal>.)
           </para>
 
           <para>

@@ -10784,6 +10798,196 @@
         </listitem>
 
         <listitem>
+          <para id="sysvar_ndb_join_pushdown">
+            <literal role="sysvar">ndb_join_pushdown</literal>
+          </para>
+
+          <para condition="dynamic:optvar:item" role="5.1:mysqld:ndb_join_pushdown"/>
+
+          <para>
+            Added in MySQL Cluster NDB 7.2.0, this variable controls
+            whether joins on <literal role="se">NDB</literal> tables are
+            pushed down to the NDB kernel (data nodes). Previously, a
+            join was handled using multiple accesses of
+            <literal role="se">NDB</literal> by the SQL node; however,
+            when <literal role="sysvar">ndb_join_pushdown</literal> is
+            enabled, a pushable join is sent in its entirety to the data
+            nodes, where it can be distributed among the data nodes and
+            executed in parallel on multiple copies of the data, with a
+            single, merged result being returned to
+            <command>mysqld</command>. This can reduce greatly the
+            number of round trips between an SQL node and the data nodes
+            required to handle such a join.
+          </para>
+
+          <para>
+            By default,
+            <literal role="sysvar">ndb_join_pushdown</literal> is
+            enabled.
+          </para>
+
+          <para>
+            In order for a join to be pushable, it must meet the
+            following conditions:
+          </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                Any columns to be joined must use
+                <emphasis>exactly</emphasis> the same data type. (For
+                example, if an <literal role="type">INT</literal> and a
+                <literal role="type">BIGINT</literal> column are joined,
+                the join cannot be pushed down.)
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Queries referencing <literal role="type">BLOB</literal>
+                or <literal role="type">TEXT</literal> columns are not
+                supported.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Explicit locking is not supported; however, the
+                <literal role="se">NDB</literal> storage engine&apos;s
+                characteristic implicit row-based locking is enforced.
+              </para>
+
+              <para>
+                This means that a join using <literal>FOR
+                UPDATE</literal> cannot be pushed down.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Only fully or partially qualified primary keys or
+                indexes are supported for access to child tables.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Queries making up the join may use only the
+                <literal role="jointype">eq_ref</literal> or 
+                <literal role="jointype">const</literal> access method
+                (or both methods).
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                Joins referencing user-partitioned tables currently
+                cannot be pushed down.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            You can see whether a given join can be pushed down by
+            checking it with <literal role="stmt">EXPLAIN</literal>;
+            when the join can be pushed down, you can see references to
+            the <literal>pushed join</literal> in the
+            <literal>Extra</literal> column of the output, as shown in
+            this example:
+          </para>
+
+<programlisting>
+mysql&gt; <userinput>EXPLAIN</userinput>
+    -&gt;     <userinput>SELECT e.first_name, e.last_name, t.title, d.dept_name</userinput>
+    -&gt;         <userinput>FROM employees e</userinput>
+    -&gt;         <userinput>JOIN dept_emp de ON e.emp_no=de.emp_no</userinput>
+    -&gt;         <userinput>JOIN departments d ON d.dept_no=de.dept_no</userinput>
+    -&gt;         <userinput>JOIN titles t ON e.emp_no=t.emp_no\G</userinput>
+*************************** 1. row ***************************
+           id: 1
+  select_type: SIMPLE
+        table: d
+         type: ALL
+possible_keys: PRIMARY
+          key: NULL
+      key_len: NULL
+          ref: NULL
+         rows: 9
+        Extra: Parent of 4 pushed join@1
+*************************** 2. row ***************************
+           id: 1
+  select_type: SIMPLE
+        table: de
+         type: ref
+possible_keys: PRIMARY,emp_no,dept_no
+          key: dept_no
+      key_len: 4
+          ref: employees.d.dept_no
+         rows: 5305
+        Extra: Child of 'd' in pushed join@1
+*************************** 3. row ***************************
+           id: 1
+  select_type: SIMPLE
+        table: e
+         type: eq_ref
+possible_keys: PRIMARY
+          key: PRIMARY
+      key_len: 4
+          ref: employees.de.emp_no
+         rows: 1
+        Extra: Child of 'de' in pushed join@1
+*************************** 4. row ***************************
+           id: 1
+  select_type: SIMPLE
+        table: t
+         type: ref
+possible_keys: PRIMARY,emp_no
+          key: emp_no
+      key_len: 4
+          ref: employees.de.emp_no
+         rows: 19
+        Extra: Child of 'e' in pushed join@1
+4 rows in set (0.00 sec)
+</programlisting>
+
+          <para>
+            Two additional sources of information about pushed join
+            performance are available:
+          </para>
+
+          <orderedlist>
+
+            <listitem>
+              <para>
+                The status variables
+                <literal role="statvar">Ndb_pushed_queries_defined</literal>,
+                <literal role="statvar">Ndb_pushed_queries_dropped</literal>,
+                <literal role="statvar">Ndb_pushed_queries_executed</literal>,
+                and <literal role="statvar">Ndb_pushed_reads</literal>
+                (all introduced in MySQL Cluster NDB 7.2.0).
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                The counters in the <literal>ndbinfo.counters</literal>
+                table that belong to the <literal>DBSPJ</literal> kernel
+                block. (These counters and the <literal>DBSPJ</literal>
+                block were also introduced in MySQL Cluster NDB 7.2.0).
+                See <xref linkend="mysql-cluster-ndbinfo-counters"/>,
+                for information about these counters. See also
+                <xref linkend="ndb-internals-kernel-blocks-dbspj"/>, in
+                the <citetitle>MySQL Cluster API Developer
+                Guide</citetitle>.
+              </para>
+            </listitem>
+
+          </orderedlist>
+        </listitem>
+
+        <listitem>
           <para id="sysvar_ndb_log_apply_status">
             <literal role="sysvar">ndb_log_apply_status</literal>
           </para>

@@ -11513,6 +11717,59 @@
         </listitem>
 
         <listitem>
+          <para id="statvar_Ndb_pushed_queries_defined">
+            <literal role="statvar">Ndb_pushed_queries_defined</literal>
+          </para>
+
+          <para>
+            The total number of joins pushed down to the NDB kernel for
+            distributed handling on the data nodes. Note that joins
+            tested using <literal role="stmt">EXPLAIN</literal> that can
+            be pushed down contribute to this number. Added in MySQL
+            Cluster NDB 7.2.0.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para id="statvar_Ndb_pushed_queries_dropped">
+            <literal role="statvar">Ndb_pushed_queries_dropped</literal>
+          </para>
+
+          <para>
+            The number of joins that were pushed down to the NDB kernel
+            but that could not be handled there. Added in MySQL Cluster
+            NDB 7.2.0.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para id="statvar_Ndb_pushed_queries_executed">
+            <literal role="statvar">Ndb_pushed_queries_executed</literal>
+          </para>
+
+          <para>
+            The number of joins successfully pushed down to
+            <literal role="se">NDB</literal> and executed there. Added
+            in MySQL Cluster NDB 7.2.0.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para id="statvar_Ndb_pushed_reads">
+            <literal role="statvar">Ndb_pushed_reads</literal>
+          </para>
+
+          <para>
+            The number of rows returned to <command>mysqld</command>
+            from the NDB kernel by joins that were pushed down. Note
+            that executing <literal role="stmt">EXPLAIN</literal> on
+            joins that can be pushed down to
+            <literal role="se">NDB</literal> does not add to this
+            number. Added in MySQL Cluster NDB 7.2.0.
+          </para>
+        </listitem>
+
+        <listitem>
           <para id="statvar_Slave_heartbeat_period">
             <literal role="statvar">Slave_heartbeat_period</literal>
           </para>


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 11, Lines Added: 370, Lines Deleted: 39; 21866 bytes

@@ -8799,7 +8799,9 @@
             <row>
               <entry><literal>counter_name</literal></entry>
               <entry>string</entry>
-              <entry>The name (type) of the counter. See text for possible values.</entry>
+              <entry>The name of the counter. See text for names of individual counters and
+                the NDB kernel block with which each counter is
+                asoociated.</entry>
             </row>
             <row>
               <entry><literal>val</literal></entry>

@@ -8811,15 +8813,57 @@
       </informaltable>
 
       <para>
-        <literal>counter_name</literal> can be any one of the following:
-        <literal>ATTRINFO</literal>, <literal>TRANSACTIONS</literal>,
-        <literal>COMMITS</literal>, <literal>READS</literal>,
-        <literal>SIMPLE_READS</literal>, <literal>WRITES</literal>,
-        <literal>ABORTS</literal>, <literal>TABLE_SCANS</literal>,
-        <literal>RANGE_SCANS</literal>, or
-        <literal>OPERATIONS</literal>.
+        Each counter is associated with a particular NDB kernel block.
+        Prior to MySQL Cluster NDB 7.2.0, this was limited to either the
+        <literal>DBLQH</literal> kernel block or the
+        <literal>DBTC</literal> kernel block.
       </para>
 
+      <para>
+        The <literal>OPERATIONS</literal> counter is associated with the
+        <literal>DBLQH</literal> (local query handler) kernel block (see
+        <xref linkend="ndb-internals-kernel-blocks-dblqh"/>).
+      </para>
+
+      <para>
+        The <literal>ATTRINFO</literal>,
+        <literal>TRANSACTIONS</literal>, <literal>COMMITS</literal>,
+        <literal>READS</literal>, <literal>SIMPLE_READS</literal>,
+        <literal>WRITES</literal>, <literal>ABORTS</literal>,
+        <literal>TABLE_SCANS</literal>, and
+        <literal>RANGE_SCANS</literal> counters are associated with the
+        DBTC (transaction co-ordinator) kernel block (see
+        <xref linkend="ndb-internals-kernel-blocks-dbtc"/>).
+      </para>
+
+      <para>
+        MySQL Cluster NDB 7.2.0, as part of its implementation of
+        distributed pushed-down joins, adds the
+        <literal>LOCAL_TABLE_SCANS_SENT</literal>,
+        <literal>READS_RECEIVED</literal>,
+        <literal>PRUNED_RANGE_SCANS_RECEIVED</literal>,
+        <literal>RANGE_SCANS_RECEIVED</literal>,
+        <literal>LOCAL_READS_SENT</literal>,
+        <literal>CONST_PRUNED_RANGE_SCANS_RECEIVED</literal>,
+        <literal>LOCAL_RANGE_SCANS_SENT</literal>,
+        <literal>REMOTE_READS_SENT</literal>,
+        <literal>REMOTE_RANGE_SCANS_SENT</literal>,
+        <literal>READS_NOT_FOUND</literal>,
+        <literal>SCAN_BATCHES_RETURNED</literal>,
+        <literal>TABLE_SCANS_RECEIVED</literal>, and
+        <literal>SCAN_ROWS_RETURNED</literal> counters. These counters
+        are associated with the <literal>DBSPJ</literal> (select
+        push-down join) kernel block (see
+        <xref linkend="ndb-internals-kernel-blocks-dbspj"/>).
+      </para>
+
+      <remark role="todo">
+        [js] Add description tables for the counters. Detailed info for
+        the DBSPJ counters is found in
+        storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp; need to obtain
+        similar info for DBTC and DBLQH counters from devs.
+      </remark>
+
     </section>
 
     <section id="mysql-cluster-ndbinfo-diskpagebuffer">

@@ -10546,12 +10590,13 @@
           <secondary>and MySQL Cluster</secondary>
         </indexterm>
 
-        It is important to keep in mind that the MySQL grant tables use
-        the <literal>MyISAM</literal> storage engine. Because of this,
-        those tables are not duplicated or shared among MySQL servers
-        acting as SQL nodes in a MySQL Cluster. By way of example,
-        suppose that two SQL nodes <emphasis role="bold">A</emphasis>
-        and <emphasis role="bold">B</emphasis> are connected to the same
+        It is important to keep in mind that, by default, the MySQL
+        grant tables use the <literal>MyISAM</literal> storage engine.
+        Because of this, those tables are not duplicated or shared among
+        MySQL servers acting as SQL nodes in a MySQL Cluster. By way of
+        example, suppose that two SQL nodes
+        <emphasis role="bold">A</emphasis> and
+        <emphasis role="bold">B</emphasis> are connected to the same
         MySQL Cluster, which has an <literal role="se">NDB</literal>
         table named <literal>mytable</literal> in a database named
         <literal>mydb</literal>, and that you execute an SQL statement

@@ -10580,11 +10625,16 @@
 
       <para>
         In other words, <emphasis>changes in users and their privileges
-        do not automatically propagate between SQL nodes</emphasis>.
-        Synchronization of privileges between SQL nodes must be done
+        do not automatically propagate between SQL nodes by
+        default</emphasis>. Prior to MySQL Cluster NDB 7.2, any
+        synchronization of privileges between SQL nodes must be done
         either manually or by scripting an application that periodically
         synchronizes the privilege tables on all SQL nodes in the
-        cluster.
+        cluster. In MySQL Cluster NDB 7.2 and later, you can enable
+        automatic distribution of MySQL users and privileges across
+        MySQL Cluster SQL nodes; see
+        <xref linkend="mysql-cluster-privilege-distribution"/>, for
+        details.
       </para>
 
       <para>

@@ -10602,8 +10652,10 @@
         (privileges can either be revoked or not granted in the first
         place, but not denied as such), there is no special protection
         for <literal role="se">NDB</literal> tables on one SQL node from
-        users that have privileges on another SQL node. The most
-        far-reaching example of this is the MySQL
+        users that have privileges on another SQL node. (This is true
+        even if you are not using the automatic distribution of user
+        priveleges available in MySQl Cluster NDB 7.2 and later.) The
+        most far-reaching example of this is the MySQL
         <literal>root</literal> account, which can perform any action on
         any database object. In combination with empty
         <literal>[mysqld]</literal> or <literal>[api]</literal> sections

@@ -10776,7 +10828,8 @@
           <para>
             It is also a very good idea to use different passwords for
             the <literal>root</literal> accounts on different cluster
-            SQL nodes.
+            SQL nodes (unless you are using distributed privileges as
+            supported in MySQL Cluster NDB 7.2 and later).
           </para>
         </listitem>
 

@@ -10799,9 +10852,9 @@
       </important>
 
       <para>
-        You should never convert the system tables in the
-        <literal>mysql</literal> database to use the
-        <literal role="se">NDB</literal> storage engine. There are a
+        Prior to MySQL Cluster NDB 7.2, you should never convert the
+        system tables in the <literal>mysql</literal> database to use
+        the <literal role="se">NDB</literal> storage engine. There are a
         number of reasons why you should not do this, but the most
         important reason is this: <emphasis>Many of the SQL statements
         that affect <literal>mysql</literal> tables storing information

@@ -10809,14 +10862,18 @@
         other database objects cease to function if these tables are
         changed to use any storage engine other than
         <literal>MyISAM</literal></emphasis>. This is a consequence of
-        various MySQL Server internals.
+        various MySQL Server internals. Beginning with MySQL Cluster NDB
+        7.2, you can use a stored procedure provided for this purpose
+        (see <xref linkend="mysql-cluster-privilege-distribution"/>),
+        but you are strongly advised not to attempt convert the system
+        tables manually.
       </para>
 
       <para>
-        If you need to synchronize <literal>mysql</literal> system
-        tables between SQL nodes, you can use standard MySQL replication
-        to do so, or employ a script to copy table entries between the
-        MySQL servers.
+        Otherwise, if you need to synchronize <literal>mysql</literal>
+        system tables between SQL nodes, you can use standard MySQL
+        replication to do so, or employ a script to copy table entries
+        between the MySQL servers.
       </para>
 
       <formalpara>

@@ -10833,17 +10890,32 @@
       <orderedlist>
 
         <listitem>
-          <para>
-            Users and privileges established on one SQL node do not
-            automatically exist or take effect on other SQL nodes in the
-            cluster.
-          </para>
+          <formalpara>
 
-          <para>
-            Conversely, removing a user or privilege on one SQL node in
-            the cluster does not remove the user or privilege from any
-            other SQL nodes.
-          </para>
+            <title>Prior to MySQL Cluster NDB 7.2</title>
+
+            <para>
+              Users and privileges established on one SQL node do not
+              automatically exist or take effect on other SQL nodes in
+              the cluster. Conversely, removing a user or privilege on
+              one SQL node in the cluster does not remove the user or
+              privilege from any other SQL nodes.
+            </para>
+
+          </formalpara>
+
+          <formalpara>
+
+            <title>In MySQL Cluster NDB 7.2 and later</title>
+
+            <para>
+              You can cause MySQL users and privileges to be distributed
+              automatically among SQL nodes using the SQL script, and
+              the stored procedures which it contains, that are supplied
+              for this purpose.
+            </para>
+
+          </formalpara>
         </listitem>
 
         <listitem>

@@ -10852,7 +10924,9 @@
             <literal role="se">NDB</literal> table from one SQL node in
             a MySQL Cluster, that user can <quote>see</quote> any data
             in that table regardless of the SQL node from which the data
-            originated.
+            originated. (This is true even if you are not using the
+            privilege distribution support available in MySQl Cluster
+            NDB 7.2 or later.)
           </para>
         </listitem>
 

@@ -13330,4 +13404,261 @@
 
   </section>
 
+  <section id="mysql-cluster-privilege-distribution">
+
+    <title>Distributed MySQL Privileges for MySQL Cluster</title>
+
+    <para>
+      MySQL Cluster NDB 7.2 introduces support for distributing MySQL
+      users and privileges across all SQL nodes in a MySQL Cluster. This
+      support is not enabled by default; you should follow the procedure
+      outlined in this section in order to do so.
+    </para>
+
+    <para>
+      Normally, each MySQL server&apos;s user privilege tables in the
+      <literal>mysql</literal> database must use the
+      <literal role="se">MyISAM</literal> storage engine, which means
+      that a user account and its associated privileges created on one
+      SQL node are not available on the cluster&apos;s other SQL nodes.
+      In MySQL Cluster NDB 7.2 and later, an SQL file
+      <filename>ndb_dist_priv.sql</filename> is provided with the MySQL
+      Cluster distribution. This file can be found in the
+      <filename>share/mysql</filename> directory in the MySQL
+      installation directory.
+    </para>
+
+    <para>
+      The first step in enabling distributed privileges is to load this
+      script into a MySQL Server that functions as an SQL node (which we
+      refer to after this as the <firstterm>target</firstterm> SQL node
+      or MySQL Server). You can do this by executing the following
+      command from the system shell on the target SQL node after
+      changing to its MySQL installation directory (where
+      <replaceable>options</replaceable> stands for any additional
+      options needed to connect to this SQL node):
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysql <replaceable>options</replaceable> -uroot &lt; share/mysql/ndb_dist_priv.sql</userinput>
+</programlisting>
+
+    <para>
+      Importing <filename>ndb_dist_priv.sql</filename> creates a number
+      of stored routines (six stored procedures and one stored function)
+      in the <literal>mysql</literal> database on the target SQL node.
+      After connecting to the SQL node in the mysql client (as MySQL
+      <literal>root</literal>), you can verify that these were created
+      as shown here:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SELECT ROUTINE_NAME, ROUTINE_SCHEMA, ROUTINE_TYPE</userinput> 
+    -&gt;     <userinput>FROM INFORMATION_SCHEMA.ROUTINES</userinput> 
+    -&gt;     <userinput>WHERE ROUTINE_NAME LIKE 'mysql_cluster%'</userinput>
+    -&gt;     <userinput>ORDER BY ROUTINE_TYPE</userinput>;
++---------------------------------------------+----------------+--------------+
+| ROUTINE_NAME                                | ROUTINE_SCHEMA | ROUTINE_TYPE |
++---------------------------------------------+----------------+--------------+
+| mysql_cluster_privileges_are_distributed    | mysql          | FUNCTION     |
+| mysql_cluster_backup_privileges             | mysql          | PROCEDURE    |
+| mysql_cluster_move_grant_tables             | mysql          | PROCEDURE    |
+| mysql_cluster_move_privileges               | mysql          | PROCEDURE    |
+| mysql_cluster_restore_local_privileges      | mysql          | PROCEDURE    |
+| mysql_cluster_restore_privileges            | mysql          | PROCEDURE    |
+| mysql_cluster_restore_privileges_from_local | mysql          | PROCEDURE    |
++---------------------------------------------+----------------+--------------+
+
+7 rows in set (0.01 sec)
+</programlisting>
+
+    <para>
+      The stored procedure named
+      <literal>mysql_cluster_move_privileges</literal> creates backup
+      copies of the existing privilege tables, then converts them to
+      <literal role="se">NDB</literal>. Two sets of copies are created
+      in the <literal>mysql</literal> database:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          A set of local copies that use the
+          <literal role="se">MyISAM</literal> storage engine, and named
+          by adding the suffix <literal>_backup</literal> to the
+          original privilege table names.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          A set of distributed copies (using
+          <literal role="se">NDBCLUSTER</literal>). These tables are
+          named by prefixing <literal>ndb_</literal> and appending
+          <literal>_backup</literal> to the names of the original
+          tables.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      Although the original privilege tables are backed up
+      automatically, it is always a good idea to create backups manually
+      of the existing privilege tables on all affected SQL nodes before
+      proceeding. You can do this using <command>mysqldump</command> in
+      a manner similar to what is shown here:
+    </para>
+
+<programlisting>
+shell&gt; mysqldump <replaceable>options</replaceable> -uroot \
+    mysql user db tables_priv columns_priv procs_priv &gt; <replaceable>backup_file</replaceable>
+</programlisting>
+
+    <para>
+      To perform the conversion, you must be connected to the target SQL
+      node using the <command>mysql</command> client (again, as the
+      MySQL <literal>root</literal> user). Invoke the stored procedure
+      like this:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>CALL mysql_cluster_move_privileges();</userinput>
+Query OK, 0 rows affected (22.32 sec)
+</programlisting>
+
+    <para>
+      Depending on the number of rows in the privilege tables, this
+      procedure may take some time to execute. If some of the privilege
+      tables are empty, you may see one or more <errortext>No data -
+      zero rows fetched, selected, or processed</errortext> warnings
+      when <literal>mysql_cluster_move_privileges</literal> returns. In
+      such cases, the warnings may be safely ignored. To verify that the
+      conversion was successful, you can use the stored function
+      <literal>mysql_cluster_privileges_are_distributed</literal> as
+      shown here:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SELECT CONCAT(</userinput>
+    -&gt;    <userinput>'Conversion ',</userinput> 
+    -&gt;    <userinput>IF(mysql_cluster_privileges_are_distributed(), 'succeeded', 'failed'),</userinput> 
+    -&gt;    <userinput>'.')</userinput> 
+    -&gt;    <userinput>AS Result;</userinput>
++-----------------------+
+| Result                |
++-----------------------+
+| Conversion succeeded. |
++-----------------------+
+1 row in set (0.00 sec)
+</programlisting>
+
+    <para>
+      <literal>mysql_cluster_privileges_are_distributed</literal> checks
+      for the existence of the distributed privilege tables and returns
+      <literal>1</literal> if all of the privilege tables are
+      distributed; otherwise, it returns <literal>0</literal>.
+    </para>
+
+    <para>
+      You can verify that the backups have been created using a query
+      such as this one:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SELECT TABLE_NAME, ENGINE FROM INFORMATION_SCHEMA.TABLES</userinput> 
+    -&gt;     <userinput>WHERE TABLE_SCHEMA = 'mysql' AND TABLE_NAME LIKE '%backup'</userinput> 
+    -&gt;     <userinput>ORDER BY ENGINE;</userinput>
++-------------------------+------------+
+| TABLE_NAME              | ENGINE     |
++-------------------------+------------+
+| procs_priv_backup       | MyISAM     |
+| db_backup               | MyISAM     |
+| columns_priv_backup     | MyISAM     |
+| user_backup             | MyISAM     |
+| host_backup             | MyISAM     |
+| tables_priv_backup      | MyISAM     |
+| ndb_user_backup         | ndbcluster |
+| ndb_tables_priv_backup  | ndbcluster |
+| ndb_procs_priv_backup   | ndbcluster |
+| ndb_host_backup         | ndbcluster |
+| ndb_db_backup           | ndbcluster |
+| ndb_columns_priv_backup | ndbcluster |
++-------------------------+------------+
+12 rows in set (0.00 sec)
+</programlisting>
+
+    <para>
+      Once the conversion to distributed privileges has been made, any
+      time a MySQL user account is created, dropped, or has its
+      privileges updated on any SQL node, the changes take effect
+      immediately on all other MySQL servers attached to the cluster.
+      Once privileges are distributed, any new MySQL Servers that
+      connect to the cluster automatically participate in the
+      distribution.
+    </para>
+
+    <note>
+      <para>
+        For clients connected to SQL nodes at the time that
+        <literal>mysql_cluster_move_privileges</literal> is executed,
+        you may need to execute
+        <literal role="stmt" condition="flush">FLUSH
+        PRIVILEGES</literal> on those SQL nodes, or to disconnect and
+        then reconnect the clients, in order for those clients to be
+        able to see the changes in privileges.
+      </para>
+    </note>
+
+    <para>
+      All MySQL user privileges are distributed across all connected
+      MySQL Servers. This includes privileges associated with views and
+      stored routines. While automatic distribution of views and stored
+      routines is not currently supported, you can attempt to distribute
+      stored routines by issuing a statement such as
+      <literal role="stmt" condition="alter-table">ALTER TABLE
+      mysql.proc ENGINE = NDB</literal>, but you must verify manually
+      that any tables referenced by the stored routines exist on all SQL
+      nodes, since MySQL Cluster has no support at the present time for
+      doing this automatically. There is currently no way to distribute
+      views among MySQL Cluster SQL nodes, other than by creating them
+      manually on each SQL node. If you do this, you must make certain
+      that all base tables referenced by the views use the
+      <literal role="se">NDB</literal> storage engine; otherwise, the
+      views are likely to diverge very quickly.
+    </para>
+
+    <para>
+      In the event that an SQL node becomes disconnected from the
+      cluster while <literal>mysql_cluster_move_privileges</literal> is
+      running, you must drop its privilege tables after reconnecting to
+      the cluster, using a statement such as
+      <literal role="stmt" condition="drop-table">DROP TABLE IF EXISTS
+      user db tables_priv columns_priv procs_priv</literal>. This causes
+      the SQL node to use the shared privilege tables rather than its
+      own local versions of them. This is not needed when connecting a
+      new SQL node to the cluster for the first time.
+    </para>
+
+    <para>
+      In the event of an initial restart of the entire cluster (all data
+      nodes shut down, then started again with
+      <option role="ndbd">--initial</option>), the shared privilege
+      tables are lost. In this case, you can restore them using the
+      original target SQL node either from the backups made by
+      <literal>mysql_cluster_move_privileges</literal> or from a dump
+      file created with <command>mysqldump</command>. If you need to use
+      a new MySQL Server to perform the restoration, you should start it
+      with <option role="mysqld">--skip-grant-tables</option> when
+      connecting to the cluster for the first time; after this, you can
+      restore the privilege tables locally, then distribute them again
+      using <literal>mysql_cluster_move_privileges</literal>. After
+      restoring and distributing the tables, you should restart this
+      MySQL Server without the
+      <option role="mysqld">--skip-grant-tables</option> option.
+    </para>
+
+  </section>
+
 </section>


Modified: trunk/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-news-core.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/mysql-cluster-news-core.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 2, Lines Added: 82, Lines Deleted: 2; 2959 bytes

@@ -78,6 +78,87 @@
     7.X series, see <xref linkend="mysql-cluster-news-series"/>.
   </para>
 
+  <section id="mysql-cluster-news-7-2">
+
+    <title>Changes in MySQL Cluster NDB 7.2</title>
+
+    <para>
+      This section contains change history information for MySQL Cluster
+      releases based on version 7.2 of the
+      <literal role="se">NDBCLUSTER</literal> storage engine, currently
+      in development.
+    </para>
+
+<!--
+    <para>
+      When upgrading to a MySQL Cluster NDB 7.2 release from earlier
+      MySQL Cluster releases, you should be aware of the following
+      issues:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          <replaceable>Issue #1</replaceable>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <replaceable>Issue #2</replaceable>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <replaceable>etc.</replaceable>
+        </para>
+      </listitem>
+
+    </itemizedlist>
+-->
+
+    <para>
+      For an overview of new features added in MySQL Cluster NDB 7.2,
+      see <xref linkend="mysql-cluster-development-5-1-ndb-7-2"/>.
+    </para>
+
+    <section id="mysql-cluster-news-5-1-51-ndb-7-2-0">
+
+      <title condition="dynamic:changelog:vertitle" role="5.1.51-ndb-7.2.0:mysqld:all"/>
+
+      <para role="release-level">
+        MySQL Cluster NDB 7.2.0 is a new development preview release of
+        MySQL Cluster, incorporating several new features in the
+        <literal role="se">NDBCLUSTER</literal> storage engine for
+        testing and user feedback.
+      </para>
+
+      <formalpara>
+
+        <title>Obtaining MySQL Cluster NDB 7.2</title>
+
+        <para>
+          MySQL Cluster NDB 7.2.0 source code and binaries can be
+          obtained from <ulink url="&base-url-cluster-downloads;"/>.
+        </para>
+
+      </formalpara>
+
+      <para>
+        This release also incorporates all bugfixes and changes made in
+        previous MySQL Cluster releases, as well as all bugfixes and
+        feature changes which were added in mainline MySQL 5.1 through
+        MySQL 5.1.51 (see <xref linkend="news-5-1-51"/>).
+      </para>
+
+      <para condition="dynamic:changelog:entrylist" role="5.1.51-ndb-7.2.0:mysqld:all"/>
+
+    </section>
+
+  </section>
+
   <section id="mysql-cluster-news-7-1">
 
     <title>Changes in MySQL Cluster NDB 7.1</title>

@@ -85,8 +166,7 @@
     <para>
       This section contains change history information for MySQL Cluster
       releases based on version 7.1 of the
-      <literal role="se">NDBCLUSTER</literal> storage engine, currently
-      in development.
+      <literal role="se">NDBCLUSTER</literal> storage engine.
     </para>
 
 <!--


Modified: trunk/refman-5.1/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-overview.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/mysql-cluster-overview.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 8, Lines Added: 242, Lines Deleted: 16; 12531 bytes

@@ -1070,6 +1070,30 @@
         <colspec colwidth="50*"/>
         <thead>
           <row>
+            <entry><link linkend="mysql-cluster-development-5-1-ndb-7-2">MySQL Cluster NDB
+              7.2</link></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>Distribution of MySQL users and privileges across MySQL Cluster SQL
+              nodes</entry>
+          </row>
+          <row>
+            <entry>Distributed pushed-down joins.</entry>
+          </row>
+          <row>
+            <entry>Improved default values for data node configuration parameters.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <informaltable>
+      <tgroup cols="1">
+        <colspec colwidth="50*"/>
+        <thead>
+          <row>
             <entry><link linkend="mysql-cluster-development-5-1-ndb-7-1">MySQL Cluster NDB
               7.1</link></entry>
           </row>

@@ -1286,6 +1310,181 @@
       </tgroup>
     </informaltable>
 
+    <section id="mysql-cluster-development-5-1-ndb-7-2">
+
+      <title>MySQL Cluster Development in MySQL Cluster NDB 7.2</title>
+
+      <para>
+        The following improvements to MySQL Cluster have been made in
+        MySQL Cluster NDB 7.2.
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <formalpara>
+
+            <title>Distribution of MySQL users and privileges</title>
+
+            <para>
+              Automatic distribution of MySQL users and privileges
+              across all SQL nodes in a given MySQL Cluster is now
+              supported. To enable this support, you must first import
+              an SQL script
+              <filename>share/mysql/ndb_dist_priv.sql</filename> that is
+              included with the MySQL Cluster NDB 7.2 distribution. This
+              script creates several stored procedures which you can use
+              to enable privilege distribution and perform related
+              tasks.
+            </para>
+
+          </formalpara>
+
+          <para>
+            When a new MySQL Server joins a MySQL Cluster where
+            privilege distribution is in effect, it also participates in
+            the privilege distribution automatically.
+          </para>
+
+          <para>
+            Once privilege distribution is enabled, all changes to the
+            grant tables made on any <command>mysqld</command> attached
+            to the cluster are immediately available on any other
+            attached MySQL Servers. This is true whether the changes are
+            made using <literal role="stmt">CREATE USER</literal>,
+            <literal role="stmt">GRANT</literal>, or any of the other
+            statements described elsewhere in this Manual (see
+            <xref linkend="account-management-sql"/>.) This includes
+            privileges relating to stored routines and views; however,
+            automatic distribution of the views or stored routines
+            themselves is not currently supported.
+          </para>
+
+          <para>
+            For more information, see
+            <xref linkend="mysql-cluster-privilege-distribution"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <formalpara>
+
+            <title>Distributed pushed-down joins</title>
+
+            <para>
+              Many joins can now be pushed down to the NDB kernel for
+              processing on MySQL Cluster data nodes. Previously, a join
+              was handled in MySQL Cluster by means of repeated accesses
+              of <literal role="se">NDB</literal> by the SQL node;
+              however, when pushed-down joins are enabled, a pushable
+              join is sent in its entirety to the data nodes, where it
+              can be distributed among the data nodes and executed in
+              parallel on multiple copies of the data, with a single,
+              merged result being returned to <command>mysqld</command>.
+              This can reduce greatly the number of round trips between
+              an SQL node and the data nodes required to handle such a
+              join, leading to greatly improved performance of join
+              processing.
+            </para>
+
+          </formalpara>
+
+          <para>
+            It is possible to determine when joins can be pushed down to
+            the data nodes by examining the join with
+            <literal role="stmt">EXPLAIN</literal>. A number of new
+            system status variables
+            (<literal role="statvar">Ndb_pushed_queries_defined</literal>,
+            <literal role="statvar">Ndb_pushed_queries_dropped</literal>,
+            <literal role="statvar">Ndb_pushed_queries_executed</literal>,
+            and <literal role="statvar">Ndb_pushed_reads</literal>) and
+            additions to the <literal>ndbinfo.counters</literal> table
+            can also be helpful in determining when and how well joins
+            are being pushed down.
+          </para>
+
+          <para>
+            More information and examples are available in the
+            description of the
+            <literal role="sysvar">ndb_join_pushdown</literal> server
+            system variable. See also the description of the status
+            variables referenced in the previous paragraph, as well as
+            <xref linkend="mysql-cluster-ndbinfo-counters"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <formalpara>
+
+            <title>Improved default values for data node configuration parameters</title>
+
+            <para>
+              In order to provide more resiliency to environmental
+              issues and better handling of some potential failure
+              scenarios, and to perform more reliably with increases in
+              memory and other resource requirements brought about by
+              recent improvements in join handling by
+              <literal role="se">NDB</literal>, the default values for a
+              number of MySQL Cluster data node configuration parameters
+              have been changed. The parameters and changes are
+              described in the following list:
+            </para>
+
+          </formalpara>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                <literal role="ndbparam:ndbd">HeartbeatIntervalDbDb</literal>:
+                Default increased from 1500 ms to 5000 ms.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal role="ndbparam:ndbd">ArbitrationTimeout</literal>:
+                Default increased from 3000 ms to 7500 ms.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal role="ndbparam:ndbd">TimeBetweenEpochsTimeout</literal>:
+                Now effectively disabled by default (default changed
+                from 4000 ms to 0).
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal role="ndbparam:ndbd">SharedGlobalMemory</literal>:
+                Default increased from 20 MB to 128 MB.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal role="ndbparam:ndbd">MaxParallelScansPerFragment</literal>:
+                Default increased from 32 to 256.
+              </para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para>
+            In addition, the value computed for
+            <literal role="ndbparam:ndbd">MaxNoOfLocalScans</literal>
+            when this parameter is not set in
+            <filename>config.ini</filename> has been increased by a
+            factor of 4.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+    </section>
+
     <section id="mysql-cluster-development-5-1-ndb-7-1">
 
       <title>MySQL Cluster Development in MySQL Cluster NDB 7.1</title>

@@ -6108,7 +6307,7 @@
               <literal>REORGANIZE PARTITION</literal>, and
               <literal>COALESCE PARTITION</literal>&mdash;are supported
               for Cluster tables, but use copying and so are not
-              optimised. See
+              optimized. See
               <xref linkend="partitioning-management-range-list"/> and
               <xref linkend="alter-table"/>.
             </para>

@@ -6640,8 +6839,8 @@
               </important>
 
               <para>
-                <literal>LOAD DATA FROM MASTER</literal> is not
-                supported in MySQL Cluster.
+                <literal role="stmt">LOAD DATA FROM MASTER</literal> is
+                not supported in MySQL Cluster.
               </para>
             </listitem>
 

@@ -6965,8 +7164,8 @@
             <title><literal>LOAD TABLE ... FROM MASTER</literal></title>
 
             <para>
-              <literal>LOAD TABLE ... FROM MASTER</literal> is not
-              supported.
+              <literal role="stmt">LOAD TABLE FROM MASTER</literal> is
+              not supported.
             </para>
 
           </formalpara>

@@ -7166,17 +7365,17 @@
 
             <listitem>
               <para>
-                MySQL Cluster cannot produce a binlog for tables having
-                <literal role="type">BLOB</literal> columns but no
-                primary key.
+                MySQL Cluster cannot produce a binary log for tables
+                having <literal role="type">BLOB</literal> columns but
+                no primary key.
               </para>
             </listitem>
 
             <listitem>
               <para>
                 Only the following schema operations are logged in a
-                cluster binlog which is <emphasis>not</emphasis> on the
-                <command>mysqld</command> executing the statement:
+                cluster binary log which is <emphasis>not</emphasis> on
+                the <command>mysqld</command> executing the statement:
               </para>
 
               <itemizedlist>

@@ -8106,12 +8305,13 @@
             <title><literal>InnoDB</literal> plugin support</title>
 
             <para>
-              Previously, InnoDB support in MySQL Cluster was limited to
-              the version built in to the MySQl Server. Beginning with
-              MySQL Cluster NDB 7.1.9, MySQL Cluster also provides
-              support for the <literal role="se">InnoDB</literal>
-              Plugin. See <xref linkend="mysql-cluster-multi-install"/>,
-              for information about enabling
+              Previously, <literal role="se">InnoDB</literal> support in
+              MySQL Cluster was limited to the version built in to the
+              MySQl Server. Beginning with MySQL Cluster NDB 7.1.9,
+              MySQL Cluster also provides support for the
+              <literal role="se">InnoDB</literal> Plugin. See
+              <xref linkend="mysql-cluster-multi-install"/>, for
+              information about enabling
               <literal role="se">InnoDB</literal> storage engine and
               plugin support with MySQL Cluster.
             </para>

@@ -8119,6 +8319,32 @@
           </formalpara>
         </listitem>
 
+        <listitem>
+          <formalpara>
+
+            <title>Distribution of MySQL users and privileges</title>
+
+            <para>
+              Previously, MySQL users and privileges created on one SQL
+              node were unique to that SQL node, due to the fact that
+              the MySQL grant tables were restricted to using the
+              <literal role="se">MyISAM</literal> storage engine.
+              Beginning with MySQL Cluster NDB 7.2.0, it is possible,
+              following installation of the MySQL Cluster software and
+              setup of the desired users and privileges on one SQL node,
+              to convert the grant tables to use
+              <literal role="se">NDB</literal> and thus to distribute
+              the users and privileges across all SQL nodes connected to
+              the cluster. You can do this by loading and making use of
+              a set of stored procedures defined in an SQL script
+              supplied with the MySQL Cluster distribution. For more
+              information, see
+              <xref linkend="mysql-cluster-privilege-distribution"/>.
+            </para>
+
+          </formalpara>
+        </listitem>
+
       </itemizedlist>
 
     </section>


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.1/optimization.xml	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 3, Lines Added: 39, Lines Deleted: 3; 2636 bytes

@@ -1373,6 +1373,24 @@
 
             <listitem>
               <para>
+                <literal>Child of '<replaceable>table</replaceable>'
+                pushed join@1</literal>
+              </para>
+
+              <para>
+                This table is referenced as the child of
+                <replaceable>table</replaceable> in a join that can be
+                pushed down to the NDB kernel. Applies only in MySQL
+                Cluster NDB 7.2.0 and later, when pushed-down joins are
+                enabled. See the description of the
+                <literal role="sysvar">ndb_join_pushdown</literal>
+                server system variable for more information and
+                examples.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 <literal>const row not found</literal>
               </para>
 

@@ -1517,6 +1535,25 @@
 
             <listitem>
               <para>
+                <literal>Parent of <replaceable>N</replaceable> pushed
+                join@1</literal>
+              </para>
+
+              <para>
+                This table is referenced as the parent of the table in
+                row <replaceable>N</replaceable> of the current
+                <literal role="stmt">EXPLAIN</literal> output in a join
+                that can be pushed down to the NDB kernel. Applies only
+                in MySQL Cluster NDB 7.2.0 and later when pushed-down
+                joins are enabled. See the description of the
+                <literal role="sysvar">ndb_join_pushdown</literal>
+                server system variable for more information and
+                examples.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 <literal>Range checked for each record (index map:
                 <replaceable>N</replaceable>)</literal>
               </para>

@@ -12070,9 +12107,8 @@
         concurrent inserts are disabled. If the variable is set to 2,
         concurrent inserts at the end of the table are permitted even
         for tables that have deleted rows. See also the description of
-        the
-        <link linkend="sysvar_concurrent_insert"><literal role="sysvar">concurrent_insert</literal></link>
-        system variable.
+        the <literal role="sysvar">concurrent_insert</literal> system
+        variable.
       </para>
 
       <para>


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.5/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 17, Lines Added: 14, Lines Deleted: 522; 27966 bytes

@@ -1848,31 +1848,7 @@
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1989,77 +1965,7 @@
 	versions.ent
 dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2176,44 +2082,7 @@
 	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2330,25 +2199,7 @@
 	versions.ent
 dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2465,12 +2316,7 @@
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2587,10 +2433,7 @@
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2707,26 +2550,7 @@
 	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2843,78 +2667,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3031,42 +2784,7 @@
 	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3183,26 +2901,7 @@
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3319,21 +3018,7 @@
 	versions.ent
 dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3450,64 +3135,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3624,55 +3252,7 @@
 	versions.ent
 dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -3789,91 +3369,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -6744,7 +6240,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6757,11 +6252,9 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \

@@ -6784,7 +6277,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \


Modified: trunk/refman-5.6/Makefile.depends
===================================================================
--- trunk/refman-5.6/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-5.6/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 532 bytes

@@ -7721,6 +7721,7 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/information-schema.idmap \
+	metadata/innodb-performance.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/refman-6.0/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 18, Lines Added: 14, Lines Deleted: 525; 28220 bytes

@@ -1772,31 +1772,7 @@
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1910,76 +1886,7 @@
 	versions.ent
 dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2093,43 +2000,7 @@
 	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2243,25 +2114,7 @@
 	versions.ent
 dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2375,13 +2228,7 @@
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/sql-syntax-transactions.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2495,10 +2342,7 @@
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2612,26 +2456,7 @@
 	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2745,78 +2570,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -2930,42 +2684,7 @@
 	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3079,26 +2798,7 @@
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3212,20 +2912,7 @@
 	versions.ent
 dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/optimization.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3339,67 +3026,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3513,58 +3140,7 @@
 	versions.ent
 dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -3678,89 +3254,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/news-5.2-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -6194,7 +5688,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6207,11 +5700,9 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \

@@ -6234,7 +5725,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-generic-binary.idmap \

@@ -6249,7 +5739,6 @@
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \
 	metadata/licenses-third-party-core.idmap \
-	metadata/news-5.2-core.idmap \
 	metadata/news-6.0-core.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2011-04-08 23:53:09 UTC (rev 25817)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2011-04-10 12:49:45 UTC (rev 25818)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 1; 14596 bytes

@@ -129,15 +129,19 @@
 	../../common/license-gnu-readline.xml \
 	../../common/license-google-io-rate-patch.xml \
 	../../common/license-google-smp-patch.xml \
+	../../common/license-google-tcmalloc.xml \
 	../../common/license-lib-sql.xml \
 	../../common/license-libedit.xml \
 	../../common/license-libevent.xml \
 	../../common/license-libstring.xml \
+	../../common/license-linux-pam.xml \
 	../../common/license-lpeg.xml \
 	../../common/license-lua.xml \
 	../../common/license-luafilesystem.xml \
 	../../common/license-md5.xml \
+	../../common/license-memcached.xml \
 	../../common/license-nt-servc.xml \
+	../../common/license-openpam.xml \
 	../../common/license-pcre.xml \
 	../../common/license-percona-io-threads-patch.xml \
 	../../common/license-regex.xml \

@@ -261,15 +265,19 @@
 	../../common/license-gnu-readline.xml \
 	../../common/license-google-io-rate-patch.xml \
 	../../common/license-google-smp-patch.xml \
+	../../common/license-google-tcmalloc.xml \
 	../../common/license-lib-sql.xml \
 	../../common/license-libedit.xml \
 	../../common/license-libevent.xml \
 	../../common/license-libstring.xml \
+	../../common/license-linux-pam.xml \
 	../../common/license-lpeg.xml \
 	../../common/license-lua.xml \
 	../../common/license-luafilesystem.xml \
 	../../common/license-md5.xml \
+	../../common/license-memcached.xml \
 	../../common/license-nt-servc.xml \
+	../../common/license-openpam.xml \
 	../../common/license-pcre.xml \
 	../../common/license-percona-io-threads-patch.xml \
 	../../common/license-regex.xml \

@@ -1881,7 +1889,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-cluster-excerpt-aspec.xml.mysql-cluster-programs.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-replication.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-overview.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-management.none.chapter.xml mysql-cluster-excerpt-aspec.xml.faqs-mysql-cluster.none.appendix.xml mysql-cluster-excerpt-aspec.xml.licenses-third-party.none.appendix.xml mysql-cluster-excerpt-aspec.xml.preface-mysql-cluster-excerpt.none.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-multi-computer.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/replicas-groups-1-2.png ../../common/metadata/license-regex.idmap ../../refman-5.1/mysql-cluster.xml ../../refman-5.1/mysql-cluster-replication-core.xml ../../common/metadata/license-gnu-libtool.idmap ../../c
 ommon/metadata/license-md5.idmap ../../refman-5.1/../refman-common/images/published/rolling-restarts.png ../../common/license-dtoa.xml ../../common/metadata/license-ant-contrib.idmap mysql-cluster-excerpt-aspec.xml ../../common/license-ant-contrib.xml ../../common/metadata/license-getarg.idmap ../../common/metadata/license-slf4j.idmap ../../common/metadata/license-libevent.idmap ../../common/metadata/license-libedit.idmap ../../common/license-slf4j.xml ../../common/license-google-io-rate-patch.xml ../../common/metadata/license-nt-servc.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-1.png ../../refman-5.1/mysql-cluster-configuration-core.xml ../../common/license-md5.xml ../../common/metadata/license-findgtest-cmake.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-3.png ../../common/license-libedit.xml ../../refman-5.1/mysql-cluster-overview.xml ../../common/metadata/license-zlib.idmap ../../refman-5.1/../refm
 an-common/images/published/cluster-replication-overview.png ../../common/phrases.ent ../../refman-common/urls.ent ../../refman-5.1/metadata/mysql-cluster-replication-core.idmap ../../refman-5.1/mysql-cluster-multi-computer.xml ../../common/license-zlib.xml ../../common/metadata/license-libstring.idmap ../../refman-5.1/versions.ent mysql-cluster-excerpt-base.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-2.png ../../common/fixedchars.ent ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master-mysqlds.png ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png ../../common/license-gnu-libtool.xml ../../refman-5.1/metadata/mysql-cluster-overview.idmap ../../common/license-libevent.xml ../../refman-5.1/../refman-common/images/published/multi-comp-1.png ../../common/metadata/license-gnu-lgpl-2-1.idmap ../../common/metadata/license-gnu-readline.idmap ../../common/metadata/license-gl
 ib-proxy.idmap ../../common/metadata/license-percona-io-threads-patch.idmap ../../common/license-lpeg.xml ../../common/metadata/license-dtoa.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master.png ../../common/metadata/license-gnu-gpl-2-0.idmap ../../common/all-entities.ent ../../common/license-antlr-3.xml ../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap ../../common/license-sha1-in-c.xml ../../common/metadata/license-antlr-3.idmap ../../common/metadata/license-pcre.idmap ../../common/license-getarg.xml ../../common/license-pcre.xml ../../refman-5.1/metadata/faqs-core.idmap ../../common/license-dbug.xml ../../common/license-lib-sql.xml ../../refman-5.1/metadata/mysql-cluster-management.idmap ../../refman-5.1/licenses-third-party-core.xml ../../common/license-gnu-readline.xml ../../common/metadata/license-zlib-net.idmap ../../refman-5.1/../refman-common/images/published/cluster-components-1.png ../../common/license-luafilesyst
 em.xml ../../common/license-libstring.xml ../../refman-5.1/../refman-common/images/published/cluster-security-network-2.png ../../common/license-findgtest-cmake.xml ../../refman-5.1/../refman-common/images/published/replicas-groups-1-1.png ../../common/metadata/license-us-secure-hash.idmap ../../refman-5.1/metadata/mysql-cluster.idmap ../../refman-5.1/metadata/licenses-third-party-core.idmap ../../refman-5.1/metadata/preface-mysql-cluster-excerpt.idmap all-entities.ent ../../common/license-percona-io-threads-patch.xml ../../common/license-gnu-gpl-2-0.xml ../../common/license-lua.xml ../../refman-5.1/mysql-cluster-management.xml ../../common/metadata/license-google-io-rate-patch.idmap ../../common/metadata/license-lpeg.idmap ../../common/metadata/license-lib-sql.idmap ../../common/license-us-secure-hash.xml ../../mysql-monitor-common/enterprise.ent ../../common/metadata/license-google-smp-patch.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-binlo
 g-injector.png ../../common/metadata/license-luafilesystem.idmap ../../common/license-gnu-lgpl-2-1.xml ../../common/metadata/license-lua.idmap ../../refman-5.1/../refman-common/images/published/ndb-size-pl-1.png ../../common/metadata/license-dbug.idmap ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png ../../refman-5.1/metadata/mysql-cluster-configuration-core.idmap ../../common/license-boost.xml ../../common/license-zlib-net.xml ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png ../../common/metadata/license-sha1-in-c.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-ipv6.png ../../common/license-regex.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-1.png ../../common/license-glib-proxy.xml ../../refman-5.1/mysql-cluster-programs-core.xml ../../refman-5.1/metadata/mysql-cluster-programs-core.idmap ../../common/license-google-smp-patc
 h.xml ../../refman-5.1/faqs-core.xml ../../common/metadata/license-boost.idmap ../../common/license-nt-servc.xml ../../refman-5.1/preface-mysql-cluster-excerpt.xml
+mysql-cluster-excerpt-aspec.xml.mysql-cluster-programs.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-replication.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-overview.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-management.none.chapter.xml mysql-cluster-excerpt-aspec.xml.faqs-mysql-cluster.none.appendix.xml mysql-cluster-excerpt-aspec.xml.licenses-third-party.none.appendix.xml mysql-cluster-excerpt-aspec.xml.preface-mysql-cluster-excerpt.none.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-multi-computer.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/replicas-groups-1-2.png ../../common/metadata/license-regex.idmap ../../common/metadata/license-memcached.idmap ../../common/metadata/license-linux-pam.idmap ../../refman-5.1/mysql-cluster.xml ../../refman-5.
 1/mysql-cluster-replication-core.xml ../../common/metadata/license-gnu-libtool.idmap ../../common/metadata/license-md5.idmap ../../refman-5.1/../refman-common/images/published/rolling-restarts.png ../../common/license-dtoa.xml ../../common/metadata/license-ant-contrib.idmap mysql-cluster-excerpt-aspec.xml ../../common/license-ant-contrib.xml ../../common/metadata/license-getarg.idmap ../../common/metadata/license-slf4j.idmap ../../common/license-openpam.xml ../../common/metadata/license-libevent.idmap ../../common/metadata/license-libedit.idmap ../../common/license-slf4j.xml ../../common/license-google-io-rate-patch.xml ../../common/metadata/license-nt-servc.idmap ../../common/metadata/license-google-tcmalloc.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-1.png ../../refman-5.1/mysql-cluster-configuration-core.xml ../../common/license-md5.xml ../../common/metadata/license-findgtest-cmake.idmap ../../refman-5.1/../refman-common/images/publis
 hed/cluster-security-network-3.png ../../common/license-libedit.xml ../../refman-5.1/mysql-cluster-overview.xml ../../common/metadata/license-zlib.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-overview.png ../../common/phrases.ent ../../common/license-linux-pam.xml ../../refman-common/urls.ent ../../common/license-memcached.xml ../../refman-5.1/metadata/mysql-cluster-replication-core.idmap ../../refman-5.1/mysql-cluster-multi-computer.xml ../../common/license-zlib.xml ../../common/metadata/license-libstring.idmap ../../refman-5.1/versions.ent mysql-cluster-excerpt-base.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-2.png ../../common/fixedchars.ent ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master-mysqlds.png ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png ../../common/license-gnu-libtool.xml ../../refman-5.1/metadata/mysql-cluster-
 overview.idmap ../../common/license-libevent.xml ../../refman-5.1/../refman-common/images/published/multi-comp-1.png ../../common/metadata/license-gnu-lgpl-2-1.idmap ../../common/metadata/license-gnu-readline.idmap ../../common/metadata/license-glib-proxy.idmap ../../common/metadata/license-percona-io-threads-patch.idmap ../../common/license-lpeg.xml ../../common/metadata/license-dtoa.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master.png ../../common/metadata/license-gnu-gpl-2-0.idmap ../../common/all-entities.ent ../../common/license-antlr-3.xml ../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap ../../common/license-sha1-in-c.xml ../../common/metadata/license-antlr-3.idmap ../../common/metadata/license-pcre.idmap ../../common/license-getarg.xml ../../common/license-pcre.xml ../../refman-5.1/metadata/faqs-core.idmap ../../common/license-dbug.xml ../../common/license-lib-sql.xml ../../refman-5.1/metadata/mysql-cluster-manageme
 nt.idmap ../../refman-5.1/licenses-third-party-core.xml ../../common/license-gnu-readline.xml ../../common/metadata/license-zlib-net.idmap ../../refman-5.1/../refman-common/images/published/cluster-components-1.png ../../common/license-luafilesystem.xml ../../common/license-libstring.xml ../../refman-5.1/../refman-common/images/published/cluster-security-network-2.png ../../common/license-findgtest-cmake.xml ../../refman-5.1/../refman-common/images/published/replicas-groups-1-1.png ../../common/metadata/license-us-secure-hash.idmap ../../refman-5.1/metadata/mysql-cluster.idmap ../../refman-5.1/metadata/licenses-third-party-core.idmap ../../refman-5.1/metadata/preface-mysql-cluster-excerpt.idmap all-entities.ent ../../common/license-percona-io-threads-patch.xml ../../common/metadata/license-openpam.idmap ../../common/license-gnu-gpl-2-0.xml ../../common/license-lua.xml ../../refman-5.1/mysql-cluster-management.xml ../../common/metadata/license-google-io-rate-patch.idmap ../..
 /common/license-google-tcmalloc.xml ../../common/metadata/license-lpeg.idmap ../../common/metadata/license-lib-sql.idmap ../../common/license-us-secure-hash.xml ../../mysql-monitor-common/enterprise.ent ../../common/metadata/license-google-smp-patch.idmap ../../refman-5.1/../refman-common/images/published/cluster-replication-binlog-injector.png ../../common/metadata/license-luafilesystem.idmap ../../common/license-gnu-lgpl-2-1.xml ../../common/metadata/license-lua.idmap ../../refman-5.1/../refman-common/images/published/ndb-size-pl-1.png ../../common/metadata/license-dbug.idmap ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png ../../refman-5.1/metadata/mysql-cluster-configuration-core.idmap ../../common/license-boost.xml ../../common/license-zlib-net.xml ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png ../../common/metadata/license-sha1-in-c.idmap ../../refman-5.1/../refman-common/images/publi
 shed/cluster-replication-ipv6.png ../../common/license-regex.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-1.png ../../common/license-glib-proxy.xml ../../refman-5.1/mysql-cluster-programs-core.xml ../../refman-5.1/metadata/mysql-cluster-programs-core.idmap ../../common/license-google-smp-patch.xml ../../refman-5.1/faqs-core.xml ../../common/metadata/license-boost.idmap ../../common/license-nt-servc.xml ../../refman-5.1/preface-mysql-cluster-excerpt.xml
 	$(MAKE) mysql-cluster-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Thread
svn commit - mysqldoc@oter02: r25818 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars dynamic-docs/licenses ndbapi refman-5.0 refman-5....jon.stephens10 Apr