List:Commits« Previous MessageNext Message »
From:mc.brown Date:August 24 2010 9:28am
Subject:svn commit - mysqldoc@docsrva: r22409 - in trunk: common dynamic-docs/faq innodb-plugin-1.0 refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 ref...
View as plain text  
Author: mcbrown
Date: 2010-08-24 11:28:11 +0200 (Tue, 24 Aug 2010)
New Revision: 22409

Log:
Removing the old KB and Enterprise ads



Modified:
   trunk/common/license-apache-commons-fileupload.xml
   trunk/common/license-apache-commons-logging.xml
   trunk/dynamic-docs/faq/mysql-security.xml
   trunk/dynamic-docs/faq/mysql.xml
   trunk/innodb-plugin-1.0/innodb-contrib.xml
   trunk/innodb-plugin-1.0/innodb-create-index.xml
   trunk/innodb-plugin-1.0/innodb-old-mysql.xml
   trunk/innodb-plugin-1.0/innodb-other-changes.xml
   trunk/innodb-plugin-1.0/innodb-parameter-changes.xml
   trunk/innodb-plugin-1.0/innodb-plugin-glossary.xml
   trunk/innodb-plugin-1.0/innodb-row-format.xml
   trunk/innodb-plugin-1.0/innodb-upgrading.xml
   trunk/refman-4.1/apis-c.xml
   trunk/refman-4.1/backup.xml
   trunk/refman-4.1/dba-log-files.xml
   trunk/refman-4.1/dba-mysqld-server-core.xml
   trunk/refman-4.1/dba-privilege-system.xml
   trunk/refman-4.1/dba-security-core.xml
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-4.1/extending-mysql.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/programs-admin-util-core.xml
   trunk/refman-4.1/programs-client-core.xml
   trunk/refman-4.1/replication-options-core.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/se-innodb-core.xml
   trunk/refman-4.1/sql-syntax-data-definition.xml
   trunk/refman-4.1/sql-syntax-server-administration.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.0/backup.xml
   trunk/refman-5.0/dba-log-files.xml
   trunk/refman-5.0/dba-multiple-servers.xml
   trunk/refman-5.0/dba-mysqld-server-core.xml
   trunk/refman-5.0/dba-privilege-system.xml
   trunk/refman-5.0/dba-security-core.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.0/installing-core.xml
   trunk/refman-5.0/installing-updowngrade.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/language-structure-core.xml
   trunk/refman-5.0/mysql-cluster-management.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/programs-admin-util-core.xml
   trunk/refman-5.0/programs-client-core.xml
   trunk/refman-5.0/replication-configuration.xml
   trunk/refman-5.0/replication-implementation.xml
   trunk/refman-5.0/replication-notes.xml
   trunk/refman-5.0/replication-options-core.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/se-federated.xml
   trunk/refman-5.0/se-innodb-core.xml
   trunk/refman-5.0/se-myisam-core.xml
   trunk/refman-5.0/sql-syntax-data-definition.xml
   trunk/refman-5.0/sql-syntax-data-manipulation.xml
   trunk/refman-5.0/sql-syntax-server-administration.xml
   trunk/refman-5.0/sql-syntax-transactions.xml
   trunk/refman-5.0/stored-routines.xml
   trunk/refman-5.1/apis-c.xml
   trunk/refman-5.1/backup.xml
   trunk/refman-5.1/dba-log-files.xml
   trunk/refman-5.1/dba-mysqld-server-core.xml
   trunk/refman-5.1/dba-privilege-system.xml
   trunk/refman-5.1/dba-security-core.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/installing-postinstall.xml
   trunk/refman-5.1/installing-updowngrade.xml
   trunk/refman-5.1/installing-windows.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/language-structure-core.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/programs-admin-util-core.xml
   trunk/refman-5.1/programs-client-core.xml
   trunk/refman-5.1/replication-configuration.xml
   trunk/refman-5.1/replication-implementation.xml
   trunk/refman-5.1/replication-notes.xml
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/se-federated.xml
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.1/se-myisam-core.xml
   trunk/refman-5.1/sql-syntax-data-definition.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.1/sql-syntax-transactions.xml
   trunk/refman-5.1/stored-routines.xml
   trunk/refman-5.5/apis-c.xml
   trunk/refman-5.5/backup.xml
   trunk/refman-5.5/dba-log-files.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-5.5/dba-privilege-system.xml
   trunk/refman-5.5/dba-security-core.xml
   trunk/refman-5.5/errors-problems-core.xml
   trunk/refman-5.5/extending-mysql.xml
   trunk/refman-5.5/installing-core.xml
   trunk/refman-5.5/installing-updowngrade.xml
   trunk/refman-5.5/introduction.xml
   trunk/refman-5.5/language-structure-core.xml
   trunk/refman-5.5/optimization.xml
   trunk/refman-5.5/programs-admin-util-core.xml
   trunk/refman-5.5/programs-client-core.xml
   trunk/refman-5.5/replication-configuration.xml
   trunk/refman-5.5/replication-implementation.xml
   trunk/refman-5.5/replication-notes.xml
   trunk/refman-5.5/replication-options-core.xml
   trunk/refman-5.5/replication.xml
   trunk/refman-5.5/se-federated.xml
   trunk/refman-5.5/se-innodb-core.xml
   trunk/refman-5.5/se-myisam-core.xml
   trunk/refman-5.5/spatial-extensions.xml
   trunk/refman-5.5/sql-syntax-data-definition.xml
   trunk/refman-5.5/sql-syntax-server-administration.xml
   trunk/refman-5.5/sql-syntax-transactions.xml
   trunk/refman-5.5/stored-routines.xml
   trunk/refman-5.6/apis-c.xml
   trunk/refman-5.6/backup.xml
   trunk/refman-5.6/dba-log-files.xml
   trunk/refman-5.6/dba-mysqld-server-core.xml
   trunk/refman-5.6/dba-privilege-system.xml
   trunk/refman-5.6/dba-security-core.xml
   trunk/refman-5.6/errors-problems-core.xml
   trunk/refman-5.6/extending-mysql.xml
   trunk/refman-5.6/installing-core.xml
   trunk/refman-5.6/installing-updowngrade.xml
   trunk/refman-5.6/introduction.xml
   trunk/refman-5.6/language-structure-core.xml
   trunk/refman-5.6/optimization.xml
   trunk/refman-5.6/programs-admin-util-core.xml
   trunk/refman-5.6/programs-client-core.xml
   trunk/refman-5.6/replication-configuration.xml
   trunk/refman-5.6/replication-implementation.xml
   trunk/refman-5.6/replication-notes.xml
   trunk/refman-5.6/replication-options-core.xml
   trunk/refman-5.6/replication.xml
   trunk/refman-5.6/se-federated.xml
   trunk/refman-5.6/se-innodb-core.xml
   trunk/refman-5.6/se-myisam-core.xml
   trunk/refman-5.6/spatial-extensions.xml
   trunk/refman-5.6/sql-syntax-data-definition.xml
   trunk/refman-5.6/sql-syntax-server-administration.xml
   trunk/refman-5.6/sql-syntax-transactions.xml
   trunk/refman-5.6/stored-routines.xml
   trunk/refman-6.0/apis-c.xml
   trunk/refman-6.0/backup.xml
   trunk/refman-6.0/dba-log-files.xml
   trunk/refman-6.0/dba-mysqld-server-core.xml
   trunk/refman-6.0/dba-privilege-system.xml
   trunk/refman-6.0/dba-security-core.xml
   trunk/refman-6.0/errors-problems.xml
   trunk/refman-6.0/extending-mysql.xml
   trunk/refman-6.0/installing-core.xml
   trunk/refman-6.0/installing-updowngrade.xml
   trunk/refman-6.0/introduction.xml
   trunk/refman-6.0/language-structure-core.xml
   trunk/refman-6.0/optimization.xml
   trunk/refman-6.0/programs-admin-util-core.xml
   trunk/refman-6.0/programs-client-core.xml
   trunk/refman-6.0/replication-configuration.xml
   trunk/refman-6.0/replication-implementation.xml
   trunk/refman-6.0/replication-notes.xml
   trunk/refman-6.0/replication-options-core.xml
   trunk/refman-6.0/replication.xml
   trunk/refman-6.0/se-innodb-core.xml
   trunk/refman-6.0/se-myisam-core.xml
   trunk/refman-6.0/sql-syntax-data-definition.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml
   trunk/refman-6.0/sql-syntax-transactions.xml
   trunk/refman-6.0/stored-routines.xml
   trunk/refman-common/apis-php-mysqli.xml
   trunk/refman-common/apis-php.xml
   trunk/refman-common/apis-python.xml
   trunk/refman-common/connector-j.xml
   trunk/refman-common/connector-odbc.xml
   trunk/refman-common/what-is.en.xml


Modified: trunk/common/license-apache-commons-fileupload.xml
===================================================================
--- trunk/common/license-apache-commons-fileupload.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/common/license-apache-commons-fileupload.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 480 bytes

@@ -25,7 +25,7 @@
 </programlisting>
 
   <para>
-    This component is licensed under 
+    This component is licensed under
     <xref linkend="license-apache-2-0"/>.
   </para>
 


Modified: trunk/common/license-apache-commons-logging.xml
===================================================================
--- trunk/common/license-apache-commons-logging.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/common/license-apache-commons-logging.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 471 bytes

@@ -25,7 +25,7 @@
 </programlisting>
 
   <para>
-    This component is licensed under 
+    This component is licensed under
     <xref linkend="license-apache-2-0"/>.
   </para>
 


Modified: trunk/dynamic-docs/faq/mysql-security.xml
===================================================================
--- trunk/dynamic-docs/faq/mysql-security.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/dynamic-docs/faq/mysql-security.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 11; 699 bytes

@@ -93,17 +93,6 @@
 
         </itemizedlist>
       </para>
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-        <para>
-          The MySQL Enterprise Monitor enforces best practices for
-          maximizing the security of your servers. For more information
-          see <ulink url="&base-url-enterprise;advisors.html"/>.
-        </para>
-
-      </formalpara>
-
     </faqanswer>
 
   </faqentry>


Modified: trunk/dynamic-docs/faq/mysql.xml
===================================================================
--- trunk/dynamic-docs/faq/mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/dynamic-docs/faq/mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 11; 677 bytes

@@ -2945,17 +2945,6 @@
 
         </itemizedlist>
       </para>
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-        <para>
-          The MySQL Enterprise Monitor enforces best practices for
-          maximizing the security of your servers. For more information,
-          see <ulink url="&base-url-enterprise;advisors.html"/>.
-        </para>
-
-      </formalpara>
-
     </faqanswer>
 
   </faqentry>


Modified: trunk/innodb-plugin-1.0/innodb-contrib.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-contrib.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-contrib.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 117, Lines Deleted: 75; 10173 bytes

@@ -6,57 +6,76 @@
   %innodb.entities;
 ]>
 <appendix id="innodb-contrib">
+
   <title>Third-Party Software</title>
 
-  <para>Innobase Oy acknowledges that certain Third Party and Open
-  Source software has been used to develop or is incorporated in
-  &innodb; (including the &innodb_plugin;). This appendix includes
-  required third-party license information.</para>
+  <para>
+    Innobase Oy acknowledges that certain Third Party and Open Source
+    software has been used to develop or is incorporated in &innodb;
+    (including the &innodb_plugin;). This appendix includes required
+    third-party license information.
+  </para>
 
   <section id="innodb-contrib-google">
+
     <title>Performance Patches from Google</title>
 
-    <para>Innobase Oy gratefully acknowledges the following
-    contributions from Google, Inc. to improve &innodb;
-    performance:</para>
+    <para>
+      Innobase Oy gratefully acknowledges the following contributions
+      from Google, Inc. to improve &innodb; performance:
+    </para>
 
     <itemizedlist>
-      <listitem><para>Replacing &innodb;&capos;s use of Pthreads mutexes with
-      calls to GCC atomic builtins, as discussed in
-      <xref linkend="innodb-performance-latching"/>. This change
-      means that &innodb; mutex and and rw-lock operations take less
-      CPU time, and improves throughput on those platforms where the
-      atomic operations are available.</para></listitem>
-      <listitem><para>Controlling master thread <literal>I/O</literal> rate,
-        as discussed in <xref linkend="innodb-performance-thread_io_rate"/>.
-        The master thread in &innodb; is a thread that performs various
-        tasks in the background. Historically, &innodb; has used a hard
-        coded value as the total <literal>I/O</literal> capacity of the
-      server. With this change, user can control the number of
-      <literal>I/O</literal> operations that can be performed per
-      second based on their own workload.</para></listitem>
+
+      <listitem>
+        <para>
+          Replacing &innodb;&capos;s use of Pthreads mutexes with calls
+          to GCC atomic builtins, as discussed in
+          <xref linkend="innodb-performance-latching"/>. This change
+          means that &innodb; mutex and and rw-lock operations take less
+          CPU time, and improves throughput on those platforms where the
+          atomic operations are available.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Controlling master thread <literal>I/O</literal> rate, as
+          discussed in
+          <xref linkend="innodb-performance-thread_io_rate"/>. The
+          master thread in &innodb; is a thread that performs various
+          tasks in the background. Historically, &innodb; has used a
+          hard coded value as the total <literal>I/O</literal> capacity
+          of the server. With this change, user can control the number
+          of <literal>I/O</literal> operations that can be performed per
+          second based on their own workload.
+        </para>
+      </listitem>
+
     </itemizedlist>
-    
-    <para>Changes from the Google contributions were incorporated in
-      the following source code files: <literal>btr0cur.c</literal>,
+
+    <para>
+      Changes from the Google contributions were incorporated in the
+      following source code files: <literal>btr0cur.c</literal>,
       <literal>btr0sea.c</literal>, <literal>buf0buf.c</literal>,
       <literal>buf0buf.ic</literal>, <literal>ha_innodb.cc</literal>,
       <literal>log0log.c</literal>, <literal>log0log.h</literal>,
-      <literal>os0sync.h</literal>,
-      <literal>row0sel.c</literal>, <literal>srv0srv.c</literal>,
-      <literal>srv0srv.h</literal>, <literal>srv0start.c</literal>,
-      <literal>sync0arr.c</literal>, <literal>sync0rw.c</literal>,
-      <literal>sync0rw.h</literal>, <literal>sync0rw.ic</literal>,
-      <literal>sync0sync.c</literal>, <literal>sync0sync.h</literal>,
-      <literal>sync0sync.ic</literal>, and
-      <literal>univ.i</literal>.</para>
-    
-    <para>These contributions are incorporated subject to the
-      conditions contained in the file
-    <literal>COPYING.Google</literal>, which are reproduced
-    here.</para>
+      <literal>os0sync.h</literal>, <literal>row0sel.c</literal>,
+      <literal>srv0srv.c</literal>, <literal>srv0srv.h</literal>,
+      <literal>srv0start.c</literal>, <literal>sync0arr.c</literal>,
+      <literal>sync0rw.c</literal>, <literal>sync0rw.h</literal>,
+      <literal>sync0rw.ic</literal>, <literal>sync0sync.c</literal>,
+      <literal>sync0sync.h</literal>, <literal>sync0sync.ic</literal>,
+      and <literal>univ.i</literal>.
+    </para>
 
-    <programlisting
+    <para>
+      These contributions are incorporated subject to the conditions
+      contained in the file <literal>COPYING.Google</literal>, which are
+      reproduced here.
+    </para>
+
+<programlisting
 >Copyright (c) 2008, 2009, Google Inc.
 All rights reserved.
 

@@ -86,32 +105,38 @@
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.</programlisting>
+
   </section>
 
   <section id="innodb-contrib-percona">
+
     <title>Multiple Background I/O Threads Patch from Percona</title>
 
-    <para>Innobase Oy gratefully acknowledges the contribution of
-    Percona, Inc. to improve &innodb; performance by implementing
-    configurable background threads, as discussed in
-    <xref linkend="innodb-performance-multiple_io_threads"/>.
-    &innodb; uses background threads to service various types
-    of I/O requests. The change provides another way to make
-    &innodb; more scalable on high end systems.</para>
+    <para>
+      Innobase Oy gratefully acknowledges the contribution of Percona,
+      Inc. to improve &innodb; performance by implementing configurable
+      background threads, as discussed in
+      <xref linkend="innodb-performance-multiple_io_threads"/>. &innodb;
+      uses background threads to service various types of I/O requests.
+      The change provides another way to make &innodb; more scalable on
+      high end systems.
+    </para>
 
-    <para>Changes from the Percona, Inc. contribution were
-    incorporated in the following source code files:
-    <literal>ha_innodb.cc</literal>, <literal>os0file.c</literal>,
-    <literal>os0file.h</literal>, <literal>srv0srv.c</literal>,
-    <literal>srv0srv.h</literal>, and <literal>srv0start.c</literal>.
+    <para>
+      Changes from the Percona, Inc. contribution were incorporated in
+      the following source code files: <literal>ha_innodb.cc</literal>,
+      <literal>os0file.c</literal>, <literal>os0file.h</literal>,
+      <literal>srv0srv.c</literal>, <literal>srv0srv.h</literal>, and
+      <literal>srv0start.c</literal>.
     </para>
 
-    <para>This contribution is incorporated subject to the
-    conditions contained in the file
-    <literal>COPYING.Percona</literal>, which are reproduced
-    here.</para>
+    <para>
+      This contribution is incorporated subject to the conditions
+      contained in the file <literal>COPYING.Percona</literal>, which
+      are reproduced here.
+    </para>
 
-    <programlisting
+<programlisting
 >Copyright (c) 2008, 2009, Percona Inc.
 All rights reserved.
 

@@ -141,36 +166,52 @@
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.</programlisting>
+
   </section>
 
   <section id="innodb-contrib-sun_microsystems">
+
     <title>Performance Patches from Sun Microsystems</title>
 
-    <para>Innobase Oy gratefully acknowledges the following
-    contributions from Sun Microsystems, Inc. to improve &innodb;
-    performance:</para>
+    <para>
+      Innobase Oy gratefully acknowledges the following contributions
+      from Sun Microsystems, Inc. to improve &innodb; performance:
+    </para>
 
     <itemizedlist>
-      <listitem><para>Introducing the PAUSE instruction inside spin loops,
-      as discussed in
-      <xref linkend="innodb-performance-pause_instruction"/>. This
-      change increases performance in high concurrency, CPU-bound
-      workloads.</para></listitem>
-      <listitem><para>Enabling inlining of functions and prefetch with
-        Sun Studio.</para></listitem>
+
+      <listitem>
+        <para>
+          Introducing the PAUSE instruction inside spin loops, as
+          discussed in
+          <xref linkend="innodb-performance-pause_instruction"/>. This
+          change increases performance in high concurrency, CPU-bound
+          workloads.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Enabling inlining of functions and prefetch with Sun Studio.
+        </para>
+      </listitem>
+
     </itemizedlist>
-    
-    <para>Changes from the Sun Microsystems, Inc. contribution were
+
+    <para>
+      Changes from the Sun Microsystems, Inc. contribution were
       incorporated in the following source code files:
-    <literal>univ.i</literal>, <literal>ut0ut.c</literal>, and
-    <literal>ut0ut.h</literal>.</para>
+      <literal>univ.i</literal>, <literal>ut0ut.c</literal>, and
+      <literal>ut0ut.h</literal>.
+    </para>
 
-    <para>This contribution is incorporated subject to the
-    conditions contained in the file
-    <literal>COPYING.Sun_Microsystems</literal>, which are reproduced
-    here.</para>
+    <para>
+      This contribution is incorporated subject to the conditions
+      contained in the file <literal>COPYING.Sun_Microsystems</literal>,
+      which are reproduced here.
+    </para>
 
-    <programlisting
+<programlisting
 >Copyright (c) 2009, Sun Microsystems, Inc.
 All rights reserved.
 

@@ -200,6 +241,7 @@
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.</programlisting>
-</section>
 
+  </section>
+
 </appendix>


Modified: trunk/innodb-plugin-1.0/innodb-create-index.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-create-index.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-create-index.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 228, Lines Deleted: 199; 28031 bytes

@@ -5,11 +5,12 @@
   <!ENTITY % innodb.entities SYSTEM "innodb-entities.ent">
   %innodb.entities;
 ]>
+<chapter id="innodb-create-index">
 
-<chapter id="innodb-create-index">
   <title>Fast Index Creation in the &innodb; Storage Engine</title>
 
   <section id="innodb-create-index-overview">
+
     <title>Overview of Fast Index Creation</title>
 
     <indexterm>

@@ -26,62 +27,64 @@
     </indexterm>
 
     <para>
-      In &mysql; versions up to 5.0, adding or dropping an index
-      on a table with existing data can be very slow if the table has
-      many rows.  The &create_index; and
-      &drop_index; commands work by creating a new, empty
-      table defined with the requested set of indexes. It then copies the
-      existing rows to the new table one-by-one, updating the indexes as it
-      goes. Inserting entries into the indexes in this fashion, where
-      the key values are not sorted, requires random access to the index
-      nodes, and is far from optimal. After all rows from the original
-      table are copied, the old table is dropped and the copy is renamed
-      with the name of the original table.
+      In &mysql; versions up to 5.0, adding or dropping an index on a
+      table with existing data can be very slow if the table has many
+      rows. The &create_index; and &drop_index; commands work by
+      creating a new, empty table defined with the requested set of
+      indexes. It then copies the existing rows to the new table
+      one-by-one, updating the indexes as it goes. Inserting entries
+      into the indexes in this fashion, where the key values are not
+      sorted, requires random access to the index nodes, and is far from
+      optimal. After all rows from the original table are copied, the
+      old table is dropped and the copy is renamed with the name of the
+      original table.
     </para>
 
     <para>
-      Beginning with version 5.1, &mysql; allows a storage engine
-      to create or drop indexes without copying the contents of the
-      entire table.  The standard &builtin; version 5.1, however, does
-      not take advantage of this capability.  With the &innodb_plugin;,
-      however, users can in most cases add and drop indexes much more
-      efficiently than with prior releases.
+      Beginning with version 5.1, &mysql; allows a storage engine to
+      create or drop indexes without copying the contents of the entire
+      table. The standard &builtin; version 5.1, however, does not take
+      advantage of this capability. With the &innodb_plugin;, however,
+      users can in most cases add and drop indexes much more efficiently
+      than with prior releases.
     </para>
 
     <para>
-      In &innodb;, the rows of a table are stored in a clustered
-      (or primary key) index, forming what some database systems call an
-      <quote>index-organized table</quote>.  Changing the clustered
-      index requires copying the data, even with the &innodb_plugin;. However,
-      adding or dropping a secondary index with the &innodb_plugin; is much
-      faster, since it does not involve copying the data.
+      In &innodb;, the rows of a table are stored in a clustered (or
+      primary key) index, forming what some database systems call an
+      <quote>index-organized table</quote>. Changing the clustered index
+      requires copying the data, even with the &innodb_plugin;. However,
+      adding or dropping a secondary index with the &innodb_plugin; is
+      much faster, since it does not involve copying the data.
     </para>
 
     <para>
-      This new mechanism also means that you can generally speed
-      the overall process of creating and loading an indexed table by
+      This new mechanism also means that you can generally speed the
+      overall process of creating and loading an indexed table by
       creating the table with only the clustered index, and adding the
       secondary indexes after the data is loaded.
     </para>
 
     <para>
-      No syntax changes are required in the
-      &create_index; or &drop_index;
-      commands. However, there are some considerations of which you should be
-      aware (see <xref linkend="innodb-create-index-limitations"/>).
+      No syntax changes are required in the &create_index; or
+      &drop_index; commands. However, there are some considerations of
+      which you should be aware (see
+      <xref linkend="innodb-create-index-limitations"/>).
     </para>
 
     <para>
-      Because the ability to create and drop indexes does not
-      require use of a new on-disk file format, it is possible to
-      temporarily use the &innodb_plugin; to create or drop an index, and then
-      fall back to using the standard &builtin; for normal operations if
-      you wish. See <xref linkend="innodb-downgrading"/> for more
+      Because the ability to create and drop indexes does not require
+      use of a new on-disk file format, it is possible to temporarily
+      use the &innodb_plugin; to create or drop an index, and then fall
+      back to using the standard &builtin; for normal operations if you
+      wish. See <xref linkend="innodb-downgrading"/> for more
       information.
     </para>
+
   </section>
 
   <section id="innodb-create-index-examples">
+
     <title>Examples</title>
 
     <indexterm>

@@ -90,76 +93,87 @@
     </indexterm>
 
     <para>
-      It is possible to create multiple indexes on a table with
-      one &alter_table; command.  This is relatively
-      efficient, because the clustered index of the table needs to be
-      scanned only once (although the data is sorted separately for each
-      new index). For example:
+      It is possible to create multiple indexes on a table with one
+      &alter_table; command. This is relatively efficient, because the
+      clustered index of the table needs to be scanned only once
+      (although the data is sorted separately for each new index). For
+      example:
     </para>
 
-    <programlisting>CREATE TABLE T1(A INT PRIMARY KEY,<!--
+<programlisting>CREATE TABLE T1(A INT PRIMARY KEY,<!--
     --> B INT, C CHAR(1)) ENGINE=InnoDB;&#10;<!--
     -->INSERT INTO T1 VALUES&#10;<!--
     -->(1,2,'a'), (2,3,'b'), (3,2,'c'), (4,3,'d'), (5,2,'e');&#10;<!--
     -->COMMIT;&#10;<!--
     -->ALTER TABLE T1 ADD INDEX (B), ADD UNIQUE INDEX (C);</programlisting>
 
-    <para>The above commands will create table <literal>T1</literal>
-    with the clustered index (primary key) on column
-    <literal>A</literal>, insert several rows, and then build two new
-    indexes on columns <literal>B</literal> and <literal>C</literal>.
-    If there were many rows inserted into <literal>T1</literal> before
-    the &alter_table; command, this approach would be
-    much more efficient than creating the table with all its indexes
-    before loading the data.</para>
+    <para>
+      The above commands will create table <literal>T1</literal> with
+      the clustered index (primary key) on column <literal>A</literal>,
+      insert several rows, and then build two new indexes on columns
+      <literal>B</literal> and <literal>C</literal>. If there were many
+      rows inserted into <literal>T1</literal> before the &alter_table;
+      command, this approach would be much more efficient than creating
+      the table with all its indexes before loading the data.
+    </para>
 
-    <para>You may also create the indexes one at a time, but then the
-    clustered index of the table is scanned (as well as sorted) once
-    for each &create_index; command.  Thus, the
-    following commands are not as efficient as the &alter_table;
-    command above, even though neither requires
-    recreating the clustered index for table
-    <literal>T1</literal>.</para>
+    <para>
+      You may also create the indexes one at a time, but then the
+      clustered index of the table is scanned (as well as sorted) once
+      for each &create_index; command. Thus, the following commands are
+      not as efficient as the &alter_table; command above, even though
+      neither requires recreating the clustered index for table
+      <literal>T1</literal>.
+    </para>
 
-    <programlisting>CREATE INDEX B ON T1 (B);&#10;<!--
+<programlisting>CREATE INDEX B ON T1 (B);&#10;<!--
     -->CREATE UNIQUE INDEX C ON T1 (C);</programlisting>
 
-    <para>Dropping indexes in the &innodb_plugin; does not require any
-    copying of table data. Thus, you can equally quickly drop multiple
-    indexes with a single &alter_table; command or
-    multiple &drop_index; commands:</para>
+    <para>
+      Dropping indexes in the &innodb_plugin; does not require any
+      copying of table data. Thus, you can equally quickly drop multiple
+      indexes with a single &alter_table; command or multiple
+      &drop_index; commands:
+    </para>
 
-    <programlisting>ALTER TABLE T1 DROP INDEX B, DROP INDEX C;</programlisting>
+<programlisting>ALTER TABLE T1 DROP INDEX B, DROP INDEX C;</programlisting>
 
-    <para>or</para>
+    <para>
+      or
+    </para>
 
-    <programlisting>DROP INDEX B ON T1;&#10;<!--
+<programlisting>DROP INDEX B ON T1;&#10;<!--
     -->DROP INDEX C ON T1;</programlisting>
 
-    <para>Restructuring the clustered index in &innodb; always
-    requires copying the data in the table.  For example, if you
-    create a table without a primary key, &innodb; chooses one for
-    you, which may be the first <literal>UNIQUE</literal> key defined
-    on <literal>NOT NULL</literal> columns, or a system-generated key.
-    Defining a <literal>PRIMARY KEY</literal> later causes the data
-    to be copied, as in the following example:</para>
+    <para>
+      Restructuring the clustered index in &innodb; always requires
+      copying the data in the table. For example, if you create a table
+      without a primary key, &innodb; chooses one for you, which may be
+      the first <literal>UNIQUE</literal> key defined on <literal>NOT
+      NULL</literal> columns, or a system-generated key. Defining a
+      <literal>PRIMARY KEY</literal> later causes the data to be copied,
+      as in the following example:
+    </para>
 
-    <programlisting>CREATE TABLE T2 (A INT, B INT) ENGINE=InnoDB;&#10;<!--
+<programlisting>CREATE TABLE T2 (A INT, B INT) ENGINE=InnoDB;&#10;<!--
     -->INSERT INTO T2 VALUES (NULL, 1);&#10;<!--
     -->ALTER TABLE T2 ADD PRIMARY KEY (B);</programlisting>
 
-    <para>Note that when you create a <literal>UNIQUE</literal> or
-    <literal>PRIMARY KEY</literal> index, &innodb; must do some extra
-    work.  For <literal>UNIQUE</literal> indexes, &innodb; checks
-    that the table contains no duplicate values for the key.  For a
-    <literal>PRIMARY KEY</literal> index, &innodb; also
-    checks that none of the <literal>PRIMARY KEY</literal> columns
-    contains a <literal>NULL</literal>.  It is best to define the
-    primary key when you create a table, so you need not rebuild the
-    table later.</para>
+    <para>
+      Note that when you create a <literal>UNIQUE</literal> or
+      <literal>PRIMARY KEY</literal> index, &innodb; must do some extra
+      work. For <literal>UNIQUE</literal> indexes, &innodb; checks that
+      the table contains no duplicate values for the key. For a
+      <literal>PRIMARY KEY</literal> index, &innodb; also checks that
+      none of the <literal>PRIMARY KEY</literal> columns contains a
+      <literal>NULL</literal>. It is best to define the primary key when
+      you create a table, so you need not rebuild the table later.
+    </para>
+
   </section>
 
   <section id="innodb-create-index-implementation">
+
     <title>Implementation</title>
 
     <indexterm>

@@ -182,39 +196,39 @@
       secondary indexes. Since the clustered index contains the data
       values in its B-tree nodes, adding or dropping a clustered index
       does involve copying the data, and creating a new copy of the
-      table.  A secondary index, however, contains only the index key
-      and the value of the primary key. This type of index may be
-      created or dropped without copying the data in the clustered
-      index. Furthermore, because the secondary index contains the
-      values of the primary key (used to access the clustered index
-      when needed), when you change the definition of the primary key,
-      thus recreating the clustered index, all secondary indexes are
-      recreated as well.
+      table. A secondary index, however, contains only the index key and
+      the value of the primary key. This type of index may be created or
+      dropped without copying the data in the clustered index.
+      Furthermore, because the secondary index contains the values of
+      the primary key (used to access the clustered index when needed),
+      when you change the definition of the primary key, thus recreating
+      the clustered index, all secondary indexes are recreated as well.
     </para>
 
     <para>
-      Dropping a secondary index is simple. Only the internal
-      &innodb; system tables and the &mysql; data dictionary tables need
-      to be updated to reflect the fact that the index no longer exists.
+      Dropping a secondary index is simple. Only the internal &innodb;
+      system tables and the &mysql; data dictionary tables need to be
+      updated to reflect the fact that the index no longer exists.
       &innodb; returns the storage used for the index to the tablespace
       that contained it, so that new indexes or additional table rows
       may use the space.
     </para>
 
     <para>
-      To add a secondary index to an existing table, &innodb;
-      scans the table, and sorts the rows using memory buffers and
-      temporary files in order by the value(s) of the secondary index
-      key column(s).  The B-tree is then built in key-value order, which
-      is more efficient than inserting rows into an index in random
-      order with respect to the key values. Because the B-tree nodes
-      are split when they fill, building the index in this way results
-      in a higher fill-factor for the index, making it more efficient
-      for subsequent access.
+      To add a secondary index to an existing table, &innodb; scans the
+      table, and sorts the rows using memory buffers and temporary files
+      in order by the value(s) of the secondary index key column(s). The
+      B-tree is then built in key-value order, which is more efficient
+      than inserting rows into an index in random order with respect to
+      the key values. Because the B-tree nodes are split when they fill,
+      building the index in this way results in a higher fill-factor for
+      the index, making it more efficient for subsequent access.
     </para>
+
   </section>
 
   <section id="innodb-create-index-concurrency">
+
     <title>Concurrency Considerations</title>
 
     <indexterm>

@@ -223,69 +237,66 @@
     </indexterm>
 
     <para>
-      While a secondary index is being created or dropped, the
-      table is locked in shared mode.  That is, any writes to the
-      table are blocked, but the data in the table may be read.
-      When you alter the clustered index of a table, however, the table
-      is locked in exclusive mode, because the data must be copied.
-      Thus, during the creation of a new clustered index, all operations
-      on the table are blocked.
+      While a secondary index is being created or dropped, the table is
+      locked in shared mode. That is, any writes to the table are
+      blocked, but the data in the table may be read. When you alter the
+      clustered index of a table, however, the table is locked in
+      exclusive mode, because the data must be copied. Thus, during the
+      creation of a new clustered index, all operations on the table are
+      blocked.
     </para>
 
     <para>
-      Before it can start executing, a &create_index;
-      or &alter_table; command must
-      always wait for currently executing transactions that are
-      accessing the table to commit or rollback before it can proceed.
-      In addition, &alter_table; commands that
-      create a new clustered index must wait for all
-      <literal>SELECT</literal> statements that access the table to
-      complete (or their containing transactions to commit).  Even
-      though the original index exists throughout the creation of
-      the new clustered index, no transactions whose execution spans the
-      creation of the index can be accessing the table, because the
-      original table must be dropped when clustered index is
-      restructured.
+      Before it can start executing, a &create_index; or &alter_table;
+      command must always wait for currently executing transactions that
+      are accessing the table to commit or rollback before it can
+      proceed. In addition, &alter_table; commands that create a new
+      clustered index must wait for all <literal>SELECT</literal>
+      statements that access the table to complete (or their containing
+      transactions to commit). Even though the original index exists
+      throughout the creation of the new clustered index, no
+      transactions whose execution spans the creation of the index can
+      be accessing the table, because the original table must be dropped
+      when clustered index is restructured.
     </para>
 
     <para>
       Once a &create_index; or &alter_table; command that creates a
-      secondary index begins
-      executing, queries may access the table for read access, but may
-      not update the table.  If an &alter_table;
+      secondary index begins executing, queries may access the table for
+      read access, but may not update the table. If an &alter_table;
       command is changing the clustered index, all queries must wait
       until the operation completes.
     </para>
 
     <para>
-      A newly-created secondary index contains only data that is
-      current in the table as of the time the &create_index;
-      or &alter_table; command begins to execute.
-      Specifically, a newly-created index
-      contains only the versions of data as of the most-recently committed
-      transactions prior to the creation of the index. The index thus does
-      not contain any rows that were deleted (and therefore marked for
-      deletion) by transactions that completed before the
-      &create_index; or
-      &alter_table; began. Similarly, the index contains only current
-      versions of every row, and none of the old versions of rows that
-      were updated by transactions that ran before the index was
-      created.
+      A newly-created secondary index contains only data that is current
+      in the table as of the time the &create_index; or &alter_table;
+      command begins to execute. Specifically, a newly-created index
+      contains only the versions of data as of the most-recently
+      committed transactions prior to the creation of the index. The
+      index thus does not contain any rows that were deleted (and
+      therefore marked for deletion) by transactions that completed
+      before the &create_index; or &alter_table; began. Similarly, the
+      index contains only current versions of every row, and none of the
+      old versions of rows that were updated by transactions that ran
+      before the index was created.
     </para>
 
     <para>
-      Because a newly-created index contains only information
-      about data current at the time the index was created, queries that
-      need to see data that was deleted or changed before the index was
-      created cannot use the index.  The only queries that could be
-      affected by this limitation are those executing in transactions
-      that began before the creation of the index was begun.  For such
-      queries, unpredictable results could occur.  Newer queries can use
-      the index.
+      Because a newly-created index contains only information about data
+      current at the time the index was created, queries that need to
+      see data that was deleted or changed before the index was created
+      cannot use the index. The only queries that could be affected by
+      this limitation are those executing in transactions that began
+      before the creation of the index was begun. For such queries,
+      unpredictable results could occur. Newer queries can use the
+      index.
     </para>
+
   </section>
 
   <section id="innodb-create-index-recovery">
+
     <title>Crash Recovery</title>
 
     <indexterm>

@@ -294,16 +305,15 @@
     </indexterm>
 
     <para>
-      No data is lost if the server crashes while an
-      &alter_table; command is executing. Recovery,
-      however, is different for clustered indexes and secondary indexes.
+      No data is lost if the server crashes while an &alter_table;
+      command is executing. Recovery, however, is different for
+      clustered indexes and secondary indexes.
     </para>
 
     <para>
       If the server crashes while creating a secondary index, upon
-      recovery, &innodb; drops any partially created indexes. All
-      you need to do to create the index is to re-run the
-      &alter_table; or
+      recovery, &innodb; drops any partially created indexes. All you
+      need to do to create the index is to re-run the &alter_table; or
       &create_index; command.
     </para>
 

@@ -329,21 +339,23 @@
 
     <para>
       If a system crash occurs while creating a new clustered index, no
-      data is lost, but users must complete the recovery
-      process using the temporary tables that exist during the process.
+      data is lost, but users must complete the recovery process using
+      the temporary tables that exist during the process.
     </para>
 
     <para>
-      Users rarely re-create a clustered index or re-define primary keys on
-      large tables. Because system crashes are uncommon
-      and the situation described here is rare, this manual does not
-      provide information on recovering from this scenario. Instead,
-      please see the InnoDB web site:
+      Users rarely re-create a clustered index or re-define primary keys
+      on large tables. Because system crashes are uncommon and the
+      situation described here is rare, this manual does not provide
+      information on recovering from this scenario. Instead, please see
+      the InnoDB web site:
       <ulink url="http://www.innodb.com/support/tips"/>.
     </para>
+
   </section>
 
   <section id="innodb-create-index-limitations">
+
     <title>Limitations</title>
 
     <indexterm>

@@ -357,69 +369,86 @@
     </indexterm>
 
     <para>
-      You should be aware of the following considerations when
-      creating or dropping indexes using the &innodb_plugin;:
+      You should be aware of the following considerations when creating
+      or dropping indexes using the &innodb_plugin;:
     </para>
 
     <para>
-      If any of the indexed columns use the UTF-8 character
-      encoding, &mysql; will copy the table.  This has been reported as
+      If any of the indexed columns use the UTF-8 character encoding,
+      &mysql; will copy the table. This has been reported as
       <ulink url="http://bugs.mysql.com/bug.php?id=33650">MySQL Bug
       #33650</ulink>.
     </para>
 
-    <para>Due to a limitation of &mysql;, the table is copied, rather
-    than using <quote>Fast Index Creation</quote> when you create an
-    index on a <literal>TEMPORARY TABLE</literal>.  This has been
-    reported as <ulink
+    <para>
+      Due to a limitation of &mysql;, the table is copied, rather than
+      using <quote>Fast Index Creation</quote> when you create an index
+      on a <literal>TEMPORARY TABLE</literal>. This has been reported as
+      <ulink
     url="http://bugs.mysql.com/bug.php?id=39833">MySQL Bug
-    #39833</ulink>.</para>
+      #39833</ulink>.
+    </para>
 
-    <para>The command <literal>ALTER IGNORE TABLE
-    <replaceable>t</replaceable> ADD UNIQUE INDEX</literal> does not
-    delete duplicate rows.  This has been reported as <ulink
+    <para>
+      The command <literal>ALTER IGNORE TABLE
+      <replaceable>t</replaceable> ADD UNIQUE INDEX</literal> does not
+      delete duplicate rows. This has been reported as
+      <ulink
     url="http://bugs.mysql.com/bug.php?id=40344">MySQL Bug
-    #40344</ulink>.  The <literal>IGNORE</literal> keyword is ignored,
-    and duplicates cause failure of the operation with the
-    following error message:</para>
+      #40344</ulink>. The <literal>IGNORE</literal> keyword is ignored,
+      and duplicates cause failure of the operation with the following
+      error message:
+    </para>
 
-    <programlisting
+<programlisting
     >ERROR 23000: Duplicate entry '<replaceable
     >347</replaceable>' for key '<replaceable>pl</replaceable
     >'</programlisting>
 
-    <para>As noted above, a newly-created index contains only
-    information about data current at the time the index was created.
-    Therefore, you should not run queries in a transaction that might
-    use a secondary index that did not exist at the beginning of the
-    transaction.  There is no way for &innodb; to access
-    <quote>old</quote> data that is consistent with the rest of the
-    data read by the transaction.  See the discussion of locking in
-    <xref linkend="innodb-create-index-concurrency"/>.</para>
+    <para>
+      As noted above, a newly-created index contains only information
+      about data current at the time the index was created. Therefore,
+      you should not run queries in a transaction that might use a
+      secondary index that did not exist at the beginning of the
+      transaction. There is no way for &innodb; to access
+      <quote>old</quote> data that is consistent with the rest of the
+      data read by the transaction. See the discussion of locking in
+      <xref linkend="innodb-create-index-concurrency"/>.
+    </para>
 
-    <para>Prior to &innodb_plugin; 1.0.4, unexpected results could
-    occur if a query attempts to use an index created after the start
-    of the transaction containing the query.  If an old transaction
-    attempts to access a <quote>too new</quote> index, &innodb_plugin;
-    1.0.4 and later reports an error:</para>
+    <para>
+      Prior to &innodb_plugin; 1.0.4, unexpected results could occur if
+      a query attempts to use an index created after the start of the
+      transaction containing the query. If an old transaction attempts
+      to access a <quote>too new</quote> index, &innodb_plugin; 1.0.4
+      and later reports an error:
+    </para>
 
-    <programlisting
+<programlisting
     >ERROR HY000: Table definition has changed, please retry transaction<!--
     --></programlisting>
 
-    <para>As the error message suggests, committing (or rolling back) the
-    transaction, and restarting it, cures the problem.</para>
+    <para>
+      As the error message suggests, committing (or rolling back) the
+      transaction, and restarting it, cures the problem.
+    </para>
 
-    <para>&innodb_plugin; 1.0.2 introduces some improvements in error
-    handling when users attempt to drop indexes.  See section <xref
-    linkend="innodb-other-changes-drop-index"/> for details.</para>
+    <para>
+      &innodb_plugin; 1.0.2 introduces some improvements in error
+      handling when users attempt to drop indexes. See section
+      <xref
+    linkend="innodb-other-changes-drop-index"/> for details.
+    </para>
 
-    <para>Unfortunately, &mysql; 5.1 does not support efficient
-    creation or dropping of &foreign_key; constraints.  Therefore, if
-    you use &alter_table; to add or remove a &references; constraint,
-    the child table will be copied, rather than using <quote>Fast
-    Index Creation</quote>.</para>
+    <para>
+      Unfortunately, &mysql; 5.1 does not support efficient creation or
+      dropping of &foreign_key; constraints. Therefore, if you use
+      &alter_table; to add or remove a &references; constraint, the
+      child table will be copied, rather than using <quote>Fast Index
+      Creation</quote>.
+    </para>
+
   </section>
+
 </chapter>
-
 <!-- vim: set sw=2 tw=72: -->


Modified: trunk/innodb-plugin-1.0/innodb-old-mysql.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-old-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-old-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 88, Lines Deleted: 47; 6905 bytes

@@ -6,7 +6,9 @@
   %innodb.entities;
 ]>
 <appendix id="innodb-old-mysql">
+
   <title>Using the &innodb_plugin; with &mysql; 5.1.30 or Earlier</title>
+
   <indexterm>
     <primary>installing</primary>
     <secondary>binary &innodb_plugin;</secondary>

@@ -21,63 +23,102 @@
     <primary>&ignore_builtin_innodb;</primary>
     <secondary>and &skip_innodb;</secondary>
   </indexterm>
-  <para>Up to &mysql; 5.1.30, the &innodb_plugin; replaced the
-  &builtin; when the server was started with the option &skip_innodb;.
-  Due to <ulink url="http://bugs.mysql.com/42610" >MySQL Bug
-  #42610</ulink>, it was impossible to replace the &builtin; with a
-  plugin in &mysql; 5.1.31 and 5.1.32.  &mysql; 5.1.33 introduced the
-  option &ignore_builtin_innodb; to allow &innodb_plugin;
-  installation in the binary release.</para>
 
-  <para>Up to &mysql; 5.1.30, installing the binary &innodb_plugin;
-  requires that &mysql; be shut down and restarted after issuing
-  the <literal>INSTALL PLUGIN</literal> statements.  This is because
-  the <literal>INSTALL PLUGIN</literal> statement started the plugin
-  with default options.  The options would only be read from the
-  option file (<literal>my.cnf</literal> or <literal>my.ini</literal>)
-  after restarting the server.  The &innodb_plugin; worked around this
-  limitation by copying parameters from the internal data structures
-  of the &builtin;.  Beginning with &mysql; 5.1.33,
-  the <literal>INSTALL PLUGIN</literal> statement re-reads the
-  option file and passes all options to the plugin, even those that are
-  not recognized by the &builtin;.</para>
+  <para>
+    Up to &mysql; 5.1.30, the &innodb_plugin; replaced the &builtin;
+    when the server was started with the option &skip_innodb;. Due to
+    <ulink url="http://bugs.mysql.com/42610" >MySQL Bug #42610</ulink>,
+    it was impossible to replace the &builtin; with a plugin in &mysql;
+    5.1.31 and 5.1.32. &mysql; 5.1.33 introduced the option
+    &ignore_builtin_innodb; to allow &innodb_plugin; installation in the
+    binary release.
+  </para>
 
-  <para>To use the binary &innodb_plugin; with &mysql; 5.1.30 or
-  earlier, you may follow the instructions given in
-  <xref linkend="innodb-plugin-installation-dynamic"/>, with one
-  change: <emphasis>Replace the option &ignore_builtin_innodb; with
-  &skip_innodb;.</emphasis>  The general steps for dynamically
-  installing the binary &innodb_plugin; are thus as follows:</para>
+  <para>
+    Up to &mysql; 5.1.30, installing the binary &innodb_plugin; requires
+    that &mysql; be shut down and restarted after issuing the
+    <literal>INSTALL PLUGIN</literal> statements. This is because the
+    <literal>INSTALL PLUGIN</literal> statement started the plugin with
+    default options. The options would only be read from the option file
+    (<literal>my.cnf</literal> or <literal>my.ini</literal>) after
+    restarting the server. The &innodb_plugin; worked around this
+    limitation by copying parameters from the internal data structures
+    of the &builtin;. Beginning with &mysql; 5.1.33, the
+    <literal>INSTALL PLUGIN</literal> statement re-reads the option file
+    and passes all options to the plugin, even those that are not
+    recognized by the &builtin;.
+  </para>
 
+  <para>
+    To use the binary &innodb_plugin; with &mysql; 5.1.30 or earlier,
+    you may follow the instructions given in
+    <xref linkend="innodb-plugin-installation-dynamic"/>, with one
+    change: <emphasis>Replace the option &ignore_builtin_innodb; with
+    &skip_innodb;.</emphasis> The general steps for dynamically
+    installing the binary &innodb_plugin; are thus as follows:
+  </para>
+
   <itemizedlist>
-    <listitem><para>Make sure the &mysql; server is not running, using a
-    <quote>slow</quote> shutdown.</para></listitem>
 
-    <listitem><para>Prepend each &innodb; option
-    with <literal>loose_</literal>,
-    e.g., <option>loose_innodb_file_per_table</option> instead
-    of <option>innodb_file_per_table</option>, so that &mysql;
-    starts even when &innodb; is unavailable.</para></listitem>
+    <listitem>
+      <para>
+        Make sure the &mysql; server is not running, using a
+        <quote>slow</quote> shutdown.
+      </para>
+    </listitem>
 
-    <listitem><para>Add &skip_innodb;
-    and <option>default_storage_engine=MyISAM</option> to the options,
-    to prevent the built-in &innodb; from starting.</para></listitem>
+    <listitem>
+      <para>
+        Prepend each &innodb; option with <literal>loose_</literal>,
+        e.g., <option>loose_innodb_file_per_table</option> instead of
+        <option>innodb_file_per_table</option>, so that &mysql; starts
+        even when &innodb; is unavailable.
+      </para>
+    </listitem>
 
-    <listitem><para>Start the &mysql; server.</para></listitem>
+    <listitem>
+      <para>
+        Add &skip_innodb; and
+        <option>default_storage_engine=MyISAM</option> to the options,
+        to prevent the built-in &innodb; from starting.
+      </para>
+    </listitem>
 
-    <listitem><para><literal>INSTALL</literal> the &innodb_plugin; and the
-    Information Schema tables, using the supplied script or equivalent
-    commands.</para></listitem>
+    <listitem>
+      <para>
+        Start the &mysql; server.
+      </para>
+    </listitem>
 
-    <listitem><para>Verify the installation of the plugins.</para></listitem>
+    <listitem>
+      <para>
+        <literal>INSTALL</literal> the &innodb_plugin; and the
+        Information Schema tables, using the supplied script or
+        equivalent commands.
+      </para>
+    </listitem>
 
-    <listitem><para>Shut down and reconfigure the &mysql; server by editing
-    the appropriate configuration file to use &innodb; as the default
-    engine (if desired), and set appropriate configuration parameters
-    to enable use of new &innodb_plugin; features.</para></listitem>
+    <listitem>
+      <para>
+        Verify the installation of the plugins.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Shut down and reconfigure the &mysql; server by editing the
+        appropriate configuration file to use &innodb; as the default
+        engine (if desired), and set appropriate configuration
+        parameters to enable use of new &innodb_plugin; features.
+      </para>
+    </listitem>
+
   </itemizedlist>
 
-  <para>This change only affects the binary distributions of &mysql;
-  and &innodb_plugin;.  The procedure for building from source code is
-  unchanged.</para>
+  <para>
+    This change only affects the binary distributions of &mysql; and
+    &innodb_plugin;. The procedure for building from source code is
+    unchanged.
+  </para>
+
 </appendix>


Modified: trunk/innodb-plugin-1.0/innodb-other-changes.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-other-changes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-other-changes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 539, Lines Deleted: 398; 55111 bytes

@@ -6,9 +6,11 @@
   %innodb.entities;
 ]>
 <chapter id="innodb-other-changes">
+
   <title>Changes for Flexibility, Ease of Use and Reliability</title>
 
   <section id="innodb-other-changes-overview">
+
     <title>Overview</title>
 
     <para>

@@ -17,20 +19,62 @@
       performance:
     </para>
 
+    <itemizedlist>
 
-    <itemizedlist>
-      <listitem><para><xref linkend="innodb-other-changes-file-formats"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-dynamic-parameters"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-truncate"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-strict-mode"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-statistics-estimation"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-drop-index"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-show-mutex"/></para></listitem>
-      <listitem><para><xref linkend="innodb-other-changes-readahead-counters"/></para></listitem>
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-file-formats"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-dynamic-parameters"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-truncate"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-strict-mode"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-statistics-estimation"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-drop-index"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-show-mutex"/>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <xref linkend="innodb-other-changes-readahead-counters"/>
+        </para>
+      </listitem>
+
     </itemizedlist>
+
   </section>
 
   <section id="innodb-other-changes-file-formats">
+
     <title>Enabling New File Formats</title>
 
     <indexterm>

@@ -55,239 +99,297 @@
     </para>
 
     <para>
-      To create new tables that require a new file format, you
-      must enable the new &q.barracuda; file format, using the
-      configuration parameter &innodb_file_format;.
-      The value of this parameter will determine whether it will be
-      possible to create a table or index using compression or the new
-      &dynamic; row format. If you omit
-      &innodb_file_format; or set it to &q.antelope;,
-      you preclude the use of new features that would make your database
-      inaccessible to the built-in InnoDB in MySQL 5.1 and prior releases.
+      To create new tables that require a new file format, you must
+      enable the new &q.barracuda; file format, using the configuration
+      parameter &innodb_file_format;. The value of this parameter will
+      determine whether it will be possible to create a table or index
+      using compression or the new &dynamic; row format. If you omit
+      &innodb_file_format; or set it to &q.antelope;, you preclude the
+      use of new features that would make your database inaccessible to
+      the built-in InnoDB in MySQL 5.1 and prior releases.
     </para>
 
     <para>
       You can set the value of &innodb_file_format; on the command line
       when you start <literal>mysqld</literal>, or in the option file
       <literal>my.cnf</literal> (Unix operating systems) or
-      <literal>my.ini</literal> (Windows).  You can also change it
+      <literal>my.ini</literal> (Windows). You can also change it
       dynamically with the <literal>SET GLOBAL</literal> command.
     </para>
 
     <para>
-      Further information about managing file formats is presented
-      in <xref linkend="innodb-file-format"/>.
+      Further information about managing file formats is presented in
+      <xref linkend="innodb-file-format"/>.
     </para>
+
   </section>
 
   <section id="innodb-other-changes-dynamic-parameters">
+
     <title>Dynamic Control of System Configuration Parameters</title>
 
-    <para>With the &innodb_plugin; it now is possible to chance
-    certain system configuration parameters dynamically, without
-    shutting down and restarting the server as was previously
-    necessary.  This increases up-time and facilitates testing of
-    various options.  You can now set these parameters dynamically:</para>
+    <para>
+      With the &innodb_plugin; it now is possible to chance certain
+      system configuration parameters dynamically, without shutting down
+      and restarting the server as was previously necessary. This
+      increases up-time and facilitates testing of various options. You
+      can now set these parameters dynamically:
+    </para>
 
     <itemizedlist>
-      <listitem><para><link linkend="innodb-other-changes-innodb_file_per_table"
-      >&innodb_file_per_table;</link></para></listitem>
-      <listitem><para><link linkend="innodb-other-changes-innodb_stats_on_metadata"
-      >&innodb_stats_on_metadata;</link></para></listitem>
-      <listitem><para><link linkend="innodb-other-changes-innodb_lock_wait_timeout"
-      >&innodb_lock_wait_timeout;</link></para></listitem>
-      <listitem><para><link linkend="innodb-other-changes-innodb_adaptive_hash_index"
-      >&innodb_adaptive_hash_index;</link></para></listitem>
+
+      <listitem>
+        <para>
+          <link linkend="innodb-other-changes-innodb_file_per_table"
+      >&innodb_file_per_table;</link>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <link linkend="innodb-other-changes-innodb_stats_on_metadata"
+      >&innodb_stats_on_metadata;</link>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <link linkend="innodb-other-changes-innodb_lock_wait_timeout"
+      >&innodb_lock_wait_timeout;</link>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <link linkend="innodb-other-changes-innodb_adaptive_hash_index"
+      >&innodb_adaptive_hash_index;</link>
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <section id="innodb-other-changes-innodb_file_per_table">
+
       <title>Dynamically Changing &innodb_file_per_table;</title>
 
       <indexterm>
-	<primary>&innodb_file_per_table;</primary>
-	<secondary>dynamically changing</secondary>
+        <primary>&innodb_file_per_table;</primary>
+        <secondary>dynamically changing</secondary>
       </indexterm>
 
       <indexterm>
-	<primary>file per table</primary>
+        <primary>file per table</primary>
       </indexterm>
 
-      <para>Since &mysql; version 4.1, &innodb; has provided two options
-      for how tables are stored on disk. You can choose to create a new
-      table and its indexes in the shared system tablespace (corresponding to
-      the set of files named <literal>ibdata</literal> files), along
-      with other internal &innodb; system information. Or, you can chose
-      to use a separate file (an <literal>.ibd</literal> file) to store
-      a new table and its indexes.</para>
+      <para>
+        Since &mysql; version 4.1, &innodb; has provided two options for
+        how tables are stored on disk. You can choose to create a new
+        table and its indexes in the shared system tablespace
+        (corresponding to the set of files named
+        <literal>ibdata</literal> files), along with other internal
+        &innodb; system information. Or, you can chose to use a separate
+        file (an <literal>.ibd</literal> file) to store a new table and
+        its indexes.
+      </para>
 
-      <para>The tablespace style used for new tables is determined by
-      the setting of the configuration parameter
-      &innodb_file_per_table; at the time a table is
-      created. Previously, the only way to set this parameter was in
-      the &mysql; option file (<literal>my.cnf</literal> or
-      <literal>my.ini</literal>), and changing it required shutting
-      down and restarting the server.  Beginning with the
-      &innodb_plugin;, the configuration parameter
-      &innodb_file_per_table; is dynamic, and can be set
-      <literal>ON</literal> or <literal>OFF</literal> using the
-      <literal>SET GLOBAL</literal> command.  The default setting is
-      <literal>OFF</literal>, so new tables and indexes are created in
-      the system tablespace.  Dynamically changing the value of this
-      parameter requires the <literal>SUPER</literal> privilege and
-      immediately affects the operation of all connections.</para>
+      <para>
+        The tablespace style used for new tables is determined by the
+        setting of the configuration parameter &innodb_file_per_table;
+        at the time a table is created. Previously, the only way to set
+        this parameter was in the &mysql; option file
+        (<literal>my.cnf</literal> or <literal>my.ini</literal>), and
+        changing it required shutting down and restarting the server.
+        Beginning with the &innodb_plugin;, the configuration parameter
+        &innodb_file_per_table; is dynamic, and can be set
+        <literal>ON</literal> or <literal>OFF</literal> using the
+        <literal>SET GLOBAL</literal> command. The default setting is
+        <literal>OFF</literal>, so new tables and indexes are created in
+        the system tablespace. Dynamically changing the value of this
+        parameter requires the <literal>SUPER</literal> privilege and
+        immediately affects the operation of all connections.
+      </para>
 
-      <para>Tables created when &innodb_file_per_table; is
-      disabled cannot use the new compression capability, or use the new
-      row format &dynamic;. Tables created when
-      &innodb_file_per_table; is enabled can use
-      those new features, and each table and its indexes will be
-      stored in a new <literal>.ibd</literal> file.</para>
+      <para>
+        Tables created when &innodb_file_per_table; is disabled cannot
+        use the new compression capability, or use the new row format
+        &dynamic;. Tables created when &innodb_file_per_table; is
+        enabled can use those new features, and each table and its
+        indexes will be stored in a new <literal>.ibd</literal> file.
+      </para>
 
-      <para>The ability to change the setting of
-      &innodb_file_per_table; dynamically is useful for
-      testing. As noted above, the parameter
-      &innodb_file_format; is also dynamic, and must be
-      set to &q.barracuda; to create new compressed tables, or tables
-      that use the new row format &dynamic;. Since both
-      parameters are dynamic, it is easy to experiment with these table
-      formats and the downgrade procedure described in
-      <xref linkend="innodb-downgrading"/> without a system shutdown and
-      restart.</para>
+      <para>
+        The ability to change the setting of &innodb_file_per_table;
+        dynamically is useful for testing. As noted above, the parameter
+        &innodb_file_format; is also dynamic, and must be set to
+        &q.barracuda; to create new compressed tables, or tables that
+        use the new row format &dynamic;. Since both parameters are
+        dynamic, it is easy to experiment with these table formats and
+        the downgrade procedure described in
+        <xref linkend="innodb-downgrading"/> without a system shutdown
+        and restart.
+      </para>
 
-      <para>Note that the &innodb_plugin; can add and drop a table&capos;s secondary
-      indexes without re-creating the table, but must recreate the table
-      when you change the clustered (primary key) index (see
-      <xref linkend="innodb-create-index"/>).
-      When a table is recreated as a result of creating or dropping an
-      index, the table and its indexes will be stored in the shared system
-      tablespace or in its own .ibd file just as if it were created using a
-      &create_table; command (and depending on the setting
-      of &innodb_file_per_table;). When an index is created
-      without rebuilding the table, the index is stored in the same file as
-      the clustered index, regardless of the setting of
-      &innodb_file_per_table;.</para>
+      <para>
+        Note that the &innodb_plugin; can add and drop a table&capos;s
+        secondary indexes without re-creating the table, but must
+        recreate the table when you change the clustered (primary key)
+        index (see <xref linkend="innodb-create-index"/>). When a table
+        is recreated as a result of creating or dropping an index, the
+        table and its indexes will be stored in the shared system
+        tablespace or in its own .ibd file just as if it were created
+        using a &create_table; command (and depending on the setting of
+        &innodb_file_per_table;). When an index is created without
+        rebuilding the table, the index is stored in the same file as
+        the clustered index, regardless of the setting of
+        &innodb_file_per_table;.
+      </para>
+
     </section>
 
     <section id="innodb-other-changes-innodb_stats_on_metadata">
+
       <title>Dynamically Changing &innodb_stats_on_metadata;</title>
 
       <indexterm>
-	<primary>&innodb_stats_on_metadata;</primary>
-	<secondary>dynamically changing</secondary>
+        <primary>&innodb_stats_on_metadata;</primary>
+        <secondary>dynamically changing</secondary>
       </indexterm>
 
       <indexterm>
-	<primary>Optimizer Statistics Estimation</primary>
+        <primary>Optimizer Statistics Estimation</primary>
       </indexterm>
 
-      <para>As noted in <xref
-      linkend="innodb-other-changes-statistics-estimation"/>, the
-      &innodb_plugin; allows you to control the way in which &innodb;
-      gathers information about the number of distinct values in an
-      index key.  A related parameter, &innodb_stats_on_metadata;, has
-      existed since &mysql; release 5.1.17 to control whether or not
-      &innodb; performs statistics gathering when metadata statements
-      are executed.  See the MySQL manual on <ulink
+      <para>
+        As noted in
+        <xref
+      linkend="innodb-other-changes-statistics-estimation"/>,
+        the &innodb_plugin; allows you to control the way in which
+        &innodb; gathers information about the number of distinct values
+        in an index key. A related parameter,
+        &innodb_stats_on_metadata;, has existed since &mysql; release
+        5.1.17 to control whether or not &innodb; performs statistics
+        gathering when metadata statements are executed. See the MySQL
+        manual on
+        <ulink
       url="http://dev.mysql.com/doc/refman/5.1/en/innodb-parameters.html"
-      >&innodb; Startup Options and System Variables</ulink> for
-      details.</para>
+      >&innodb;
+        Startup Options and System Variables</ulink> for details.
+      </para>
 
-      <para>Beginning with release 1.0.2 of the &innodb_plugin;, it is
-      possible to change the setting of &innodb_stats_on_metadata;
-      dynamically at runtime with the command <literal>SET GLOBAL
-      innodb_stats_on_metadata=<replaceable>mode</replaceable></literal>,
-      where <literal><replaceable>mode</replaceable></literal> is
-      either <literal>ON</literal> or <literal>OFF</literal> (or
-      <literal>1</literal> or <literal>0</literal>).  Changing this
-      setting requires the <literal>SUPER</literal> privilege and
-      immediately affects the operation of all connections.</para>
+      <para>
+        Beginning with release 1.0.2 of the &innodb_plugin;, it is
+        possible to change the setting of &innodb_stats_on_metadata;
+        dynamically at runtime with the command <literal>SET GLOBAL
+        innodb_stats_on_metadata=<replaceable>mode</replaceable></literal>,
+        where <literal><replaceable>mode</replaceable></literal> is
+        either <literal>ON</literal> or <literal>OFF</literal> (or
+        <literal>1</literal> or <literal>0</literal>). Changing this
+        setting requires the <literal>SUPER</literal> privilege and
+        immediately affects the operation of all connections.
+      </para>
+
     </section>
 
     <section id="innodb-other-changes-innodb_lock_wait_timeout">
+
       <title>Dynamically Changing &innodb_lock_wait_timeout;</title>
 
       <indexterm>
-	<primary>&innodb_lock_wait_timeout;</primary>
-	<secondary>dynamically changing</secondary>
+        <primary>&innodb_lock_wait_timeout;</primary>
+        <secondary>dynamically changing</secondary>
       </indexterm>
 
       <indexterm>
-	<primary>lock wait timeout</primary>
+        <primary>lock wait timeout</primary>
       </indexterm>
 
-      <para>When a transaction is waiting for a resource, it will wait
-      for the resource to become free, or stop waiting and return with
-      the error
+      <para>
+        When a transaction is waiting for a resource, it will wait for
+        the resource to become free, or stop waiting and return with the
+        error
 
-      <programlisting
+<programlisting
       >ERROR HY000: Lock wait timeout exceeded;<!--
       --> try restarting transaction</programlisting>
 
-      The length of time a transaction will wait for a resource before
-      <quote>giving up</quote> is determined by the value of the
-      configuration parameter &innodb_lock_wait_timeout;.  The default
-      setting for this parameter is 50 seconds. The minimum setting is
-      1 second, and values above 100,000,000 disable the timeout, so a
-      transaction will wait <quote>forever</quote>.  Following a
-      timeout, the SQL statement that was executing will be rolled
-      back.  (In &mysql; 5.0.12 and earlier, the transaction rolled
-      back.)  The user application may try the statement again
-      (usually after waiting for a while), or rollback the entire
-      transaction and restart.</para>
+        The length of time a transaction will wait for a resource before
+        <quote>giving up</quote> is determined by the value of the
+        configuration parameter &innodb_lock_wait_timeout;. The default
+        setting for this parameter is 50 seconds. The minimum setting is
+        1 second, and values above 100,000,000 disable the timeout, so a
+        transaction will wait <quote>forever</quote>. Following a
+        timeout, the SQL statement that was executing will be rolled
+        back. (In &mysql; 5.0.12 and earlier, the transaction rolled
+        back.) The user application may try the statement again (usually
+        after waiting for a while), or rollback the entire transaction
+        and restart.
+      </para>
 
-      <para>Before &innodb_plugin; 1.0.2, the only way to set this
-      parameter was in the &mysql; option file
-      (<literal>my.cnf</literal> or <literal>my.ini</literal>), and
-      changing it required shutting down and restarting the server.
-      Beginning with the &innodb_plugin; 1.0.2, the configuration
-      parameter &innodb_lock_wait_timeout; can be set at runtime with
-      the <literal>SET GLOBAL</literal> or <literal>SET
-      SESSION</literal> commands.  Changing the
-      <literal>GLOBAL</literal> setting requires the
-      <literal>SUPER</literal> privilege and affects the operation of
-      all clients that subsequently connect.  Any client can change
-      the <literal>SESSION</literal> setting for
-      &innodb_lock_wait_timeout;, which affects only that
-      client.</para>
+      <para>
+        Before &innodb_plugin; 1.0.2, the only way to set this parameter
+        was in the &mysql; option file (<literal>my.cnf</literal> or
+        <literal>my.ini</literal>), and changing it required shutting
+        down and restarting the server. Beginning with the
+        &innodb_plugin; 1.0.2, the configuration parameter
+        &innodb_lock_wait_timeout; can be set at runtime with the
+        <literal>SET GLOBAL</literal> or <literal>SET SESSION</literal>
+        commands. Changing the <literal>GLOBAL</literal> setting
+        requires the <literal>SUPER</literal> privilege and affects the
+        operation of all clients that subsequently connect. Any client
+        can change the <literal>SESSION</literal> setting for
+        &innodb_lock_wait_timeout;, which affects only that client.
+      </para>
+
     </section>
 
     <section id="innodb-other-changes-innodb_adaptive_hash_index">
+
       <title>Dynamically Changing &innodb_adaptive_hash_index;</title>
 
       <indexterm>
-	<primary>&innodb_adaptive_hash_index;</primary>
-	<secondary>dynamically changing</secondary>
+        <primary>&innodb_adaptive_hash_index;</primary>
+        <secondary>dynamically changing</secondary>
       </indexterm>
 
       <indexterm>
-	<primary>adaptive hash index</primary>
+        <primary>adaptive hash index</primary>
       </indexterm>
 
-      <para>As described in <xref
-      linkend="innodb-performance-adaptive_hash_index"/>, it may be
-      desirable, depending on your workload, to dynamically enable or
-      disable the adaptive hash indexing scheme &innodb; uses to
-      improve query performance.</para>
+      <para>
+        As described in
+        <xref
+      linkend="innodb-performance-adaptive_hash_index"/>,
+        it may be desirable, depending on your workload, to dynamically
+        enable or disable the adaptive hash indexing scheme &innodb;
+        uses to improve query performance.
+      </para>
 
-      <para>Version 5.1.24 of &mysql; introduced the start-up option
-      &innodb_adaptive_hash_index; that allows the adaptive hash index
-      to be disabled.  It is enabled by default.  Starting with
-      &innodb_plugin; 1.0.3, the parameter can be modified by the
-      <literal>SET GLOBAL</literal> command, without restarting the
-      server.  Changing the setting requires the
-      <literal>SUPER</literal> privilege.</para>
+      <para>
+        Version 5.1.24 of &mysql; introduced the start-up option
+        &innodb_adaptive_hash_index; that allows the adaptive hash index
+        to be disabled. It is enabled by default. Starting with
+        &innodb_plugin; 1.0.3, the parameter can be modified by the
+        <literal>SET GLOBAL</literal> command, without restarting the
+        server. Changing the setting requires the
+        <literal>SUPER</literal> privilege.
+      </para>
 
-      <para>Disabling the adaptive hash index will empty the hash
-      table immediately.  Normal operations can continue while the
-      hash table is emptied, and executing queries that have been
-      using the hash table will access the index B-trees directly
-      instead of attempting to utilize the hash index.  When the
-      adaptive hash index is enabled, the hash table will be populated
-      during normal operation.</para>
+      <para>
+        Disabling the adaptive hash index will empty the hash table
+        immediately. Normal operations can continue while the hash table
+        is emptied, and executing queries that have been using the hash
+        table will access the index B-trees directly instead of
+        attempting to utilize the hash index. When the adaptive hash
+        index is enabled, the hash table will be populated during normal
+        operation.
+      </para>
+
     </section>
+
   </section>
 
   <section id="innodb-other-changes-truncate">
+
     <title>&truncate_table; Reclaims Space</title>
 
     <indexterm>

@@ -301,35 +403,40 @@
 
     <para>
       Starting with the &innodb_plugin;, when the user requests to
-      <code>TRUNCATE</code> a table that is stored in an
-      <literal>.ibd</literal> file of its own (because
-      &innodb_file_per_table; was enabled when
-      the table was created), and if the table is not referenced in a
-      &foreign_key; constraint, the &innodb_plugin; will
-      drop and re-create the table in a new <literal>.idb</literal> file. This
-      operation is much faster than deleting the rows
-      one by one, and will return disk space to the operating system and
-      reduce the size of page-level backups.
+
+      <code>TRUNCATE</code>
+
+      a table that is stored in an <literal>.ibd</literal> file of its
+      own (because &innodb_file_per_table; was enabled when the table
+      was created), and if the table is not referenced in a
+      &foreign_key; constraint, the &innodb_plugin; will drop and
+      re-create the table in a new <literal>.idb</literal> file. This
+      operation is much faster than deleting the rows one by one, and
+      will return disk space to the operating system and reduce the size
+      of page-level backups.
     </para>
 
     <para>
-      Previous versions of &innodb;
-      would re-use the existing <literal>.idb</literal> file,
-      thus releasing the space only
-      to &innodb; for storage management, but not to the operating system.
-      Note that when the table is truncated, the count of rows affected by
-      the <literal>TRUNCATE</literal> command is an arbitrary number.
+      Previous versions of &innodb; would re-use the existing
+      <literal>.idb</literal> file, thus releasing the space only to
+      &innodb; for storage management, but not to the operating system.
+      Note that when the table is truncated, the count of rows affected
+      by the <literal>TRUNCATE</literal> command is an arbitrary number.
     </para>
 
-    <para>Note: if there are referential constraints between the table
-    being truncated and other tables, &mysql; instead automatically
-    converts the <literal>TRUNCATE</literal> command to a
-    <literal>DELETE</literal> command that operates row-by-row, so
-    that <literal>ON DELETE</literal> operations can occur on
-    <quote>child</quote> tables.</para>
+    <para>
+      Note: if there are referential constraints between the table being
+      truncated and other tables, &mysql; instead automatically converts
+      the <literal>TRUNCATE</literal> command to a
+      <literal>DELETE</literal> command that operates row-by-row, so
+      that <literal>ON DELETE</literal> operations can occur on
+      <quote>child</quote> tables.
+    </para>
+
   </section>
 
   <section id="innodb-other-changes-strict-mode">
+
     <title>&innodb; Strict Mode</title>
 
     <indexterm>

@@ -355,41 +462,38 @@
       unintended consequences of various combinations of operational
       modes and SQL commands, the &innodb_plugin; provides a
       <quote>strict mode</quote> of operations. In this mode, &innodb;
-      will raise error
-      conditions in certain cases, rather than issue a warning and
-      process the specified command (perhaps with some unintended
-      defaults). This is analogous to &mysql;&capos;s <literal>sql_mode</literal>,
-      which controls
-      what SQL syntax &mysql; will accept, and determines whether it will
-      silently ignore errors, or validate input syntax and data values.
-      Note that there is no strict mode with the built-in &innodb;, so
-      some commands that execute without errors with the built-in
-      &innodb; will generate errors with the &innodb_plugin;, unless you
-      disable strict mode.
+      will raise error conditions in certain cases, rather than issue a
+      warning and process the specified command (perhaps with some
+      unintended defaults). This is analogous to &mysql;&capos;s
+      <literal>sql_mode</literal>, which controls what SQL syntax
+      &mysql; will accept, and determines whether it will silently
+      ignore errors, or validate input syntax and data values. Note that
+      there is no strict mode with the built-in &innodb;, so some
+      commands that execute without errors with the built-in &innodb;
+      will generate errors with the &innodb_plugin;, unless you disable
+      strict mode.
     </para>
 
     <para>
-      In the &innodb_plugin;, the setting of &innodb; strict
-      mode affects the handling of syntax errors on the &create_table;,
-      &alter_table; and &create_index; commands.  Starting with
+      In the &innodb_plugin;, the setting of &innodb; strict mode
+      affects the handling of syntax errors on the &create_table;,
+      &alter_table; and &create_index; commands. Starting with
       &innodb_plugin; version 1.0.2, the strict mode also enables a
       record size check, so that an <literal>INSERT</literal> or
-      <literal>UPDATE</literal> will never fail due to the record
-      being too large for the selected page size.
+      <literal>UPDATE</literal> will never fail due to the record being
+      too large for the selected page size.
     </para>
 
     <para>
       Using the new clauses and settings for &row_format; and
-      &key_block_size; on &create_table; and
-      &alter_table; commands and the
-      &create_index; can be confusing when not running
-      in strict mode. Unless
-      you run in strict mode, &innodb; will ignore certain syntax errors
-      and will create the table or index, with only a warning in the
-      message log. However if &innodb; strict mode is on, such errors
-      will generate an immediate error and the table or index will not
-      be created, thus saving time by catching the error at the time the
-      command is issued.
+      &key_block_size; on &create_table; and &alter_table; commands and
+      the &create_index; can be confusing when not running in strict
+      mode. Unless you run in strict mode, &innodb; will ignore certain
+      syntax errors and will create the table or index, with only a
+      warning in the message log. However if &innodb; strict mode is on,
+      such errors will generate an immediate error and the table or
+      index will not be created, thus saving time by catching the error
+      at the time the command is issued.
     </para>
 
     <para>

@@ -402,25 +506,26 @@
     <para>
       &innodb; strict mode is set with the configuration parameter
       &innodb_strict_mode;, which can be specified as
-      <literal>on</literal> or <literal>off</literal>.
-      You can set the value on the command line when you start mysqld,
-      or in the configuration file <literal>my.cnf</literal> (Unix
-      operating systems) or
-      <literal>my.ini</literal> (Windows). You can also enable or disable
-      &innodb; strict
-      mode at runtime with the command <literal>SET [GLOBAL|SESSION]
+      <literal>on</literal> or <literal>off</literal>. You can set the
+      value on the command line when you start mysqld, or in the
+      configuration file <literal>my.cnf</literal> (Unix operating
+      systems) or <literal>my.ini</literal> (Windows). You can also
+      enable or disable &innodb; strict mode at runtime with the command
+      <literal>SET [GLOBAL|SESSION]
       innodb_strict_mode=<replaceable>mode</replaceable></literal>,
       where <literal><replaceable>mode</replaceable></literal> is either
-      <literal>ON</literal> or <literal>OFF</literal>.
-      Changing the <literal>GLOBAL</literal> setting requires the
+      <literal>ON</literal> or <literal>OFF</literal>. Changing the
+      <literal>GLOBAL</literal> setting requires the
       <literal>SUPER</literal> privilege and affects the operation of
-      all clients that subsequently connect.  Any client can change
-      the <literal>SESSION</literal> setting for &innodb_strict_mode;,
-      which affects only that client.
+      all clients that subsequently connect. Any client can change the
+      <literal>SESSION</literal> setting for &innodb_strict_mode;, which
+      affects only that client.
     </para>
+
   </section>
 
   <section id="innodb-other-changes-statistics-estimation">
+
     <title>Controlling Optimizer Statistics Estimation</title>
 
     <indexterm>

@@ -442,37 +547,36 @@
 
     <para>
       The MySQL query optimizer uses estimated statistics about key
-      distributions to select or avoid using an index in an
-      execution plan, based on the relative selectivity of the index.
-      Previously, &innodb; sampled 8 random pages from an index to get
-      an estimate of the cardinality of (i.e., the number of distinct
-      values in) the index. (This page sampling technique is
-      frequently described as <quote>index dives</quote>.) This small
-      number of page samples frequently was insufficient, and could
-      give inaccurate estimates of an index&capos;s selectivity and thus
-      lead to poor choices by the query optimizer.
+      distributions to select or avoid using an index in an execution
+      plan, based on the relative selectivity of the index. Previously,
+      &innodb; sampled 8 random pages from an index to get an estimate
+      of the cardinality of (i.e., the number of distinct values in) the
+      index. (This page sampling technique is frequently described as
+      <quote>index dives</quote>.) This small number of page samples
+      frequently was insufficient, and could give inaccurate estimates
+      of an index&capos;s selectivity and thus lead to poor choices by
+      the query optimizer.
     </para>
 
     <para>
-      To give users control over the quality of the statistics
-      estimate (and thus better information for the query optimizer),
-      the number of sampled pages now can be changed via the parameter
+      To give users control over the quality of the statistics estimate
+      (and thus better information for the query optimizer), the number
+      of sampled pages now can be changed via the parameter
       &innodb_stats_sample_pages;.
     </para>
 
     <para>
-      This feature addresses user requests such as that as expressed
-      in <ulink url="http://bugs.mysql.com/25640">MySQL Bug #25640:
+      This feature addresses user requests such as that as expressed in
+      <ulink url="http://bugs.mysql.com/25640">MySQL Bug #25640:
       &innodb; Analyze Table Should Allow User Selection of Index
       Dives</ulink>.
     </para>
 
     <para>
       You can change the number of sampled pages via the global
-      parameter &innodb_stats_sample_pages;, which can be set at
-      runtime (i.e., it is a dynamic parameter). The default value for
-      this parameter is 8, preserving the same behavior as in past
-      releases.
+      parameter &innodb_stats_sample_pages;, which can be set at runtime
+      (i.e., it is a dynamic parameter). The default value for this
+      parameter is 8, preserving the same behavior as in past releases.
     </para>
 
     <para>

@@ -480,232 +584,269 @@
       index sampling for <emphasis>all</emphasis> tables and indexes.
       You should also be aware that there are the following potentially
       significant impacts when you change the index sample size:
+
       <itemizedlist>
-	<listitem>
-	  <para>small values like 1 or 2 can result in very inaccurate
-	  estimates of cardinality</para>
-	</listitem>
 
-	<listitem>
-	  <para>values much larger than 8 (say, 100), can cause a big
-	  slowdown in the time it takes to open a table or execute
-	  <literal>SHOW TABLE STATUS</literal>.</para>
-	</listitem>
+        <listitem>
+          <para>
+            small values like 1 or 2 can result in very inaccurate
+            estimates of cardinality
+          </para>
+        </listitem>
 
-	<listitem>
-	  <para>the optimizer may choose very different query plans based
-	  on different estimates of index selectivity</para>
-	</listitem>
+        <listitem>
+          <para>
+            values much larger than 8 (say, 100), can cause a big
+            slowdown in the time it takes to open a table or execute
+            <literal>SHOW TABLE STATUS</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            the optimizer may choose very different query plans based on
+            different estimates of index selectivity
+          </para>
+        </listitem>
+
       </itemizedlist>
     </para>
 
     <para>
-      Note that the cardinality estimation can be disabled for
-      metadata commands such as <literal>SHOW TABLE STATUS</literal>
-      by executing the command <literal>SET GLOBAL
+      Note that the cardinality estimation can be disabled for metadata
+      commands such as <literal>SHOW TABLE STATUS</literal> by executing
+      the command <literal>SET GLOBAL
       innodb_stats_on_metadata=OFF</literal> (or <literal>0</literal>).
-      Before &innodb_plugin;
-      1.0.2, this variable could only be set in the &mysql; option
-      file (<literal>my.cnf</literal> or <literal>my.ini</literal>),
-      and changing it required shutting down and restarting the
-      server.
+      Before &innodb_plugin; 1.0.2, this variable could only be set in
+      the &mysql; option file (<literal>my.cnf</literal> or
+      <literal>my.ini</literal>), and changing it required shutting down
+      and restarting the server.
     </para>
 
     <para>
       The cardinality (the number of different key values) in every
-      index of a table is calculated when a table is opened,
-      at &show_table_status; and &analyze_table; and on other
-      circumstances (like when the table has changed too much).
-      Note that all tables are opened, and the statistics are
-      re-estimated, when the <literal>mysql</literal> client starts if the
-      auto-rehash setting is set on (the default).
-      The auto-rehash feature enables automatic name completion
-      of database, table, and column names for interactive
-      users. You may prefer setting auto-rehash off to improve
-      the start up time of the <literal>mysql</literal> client.
+      index of a table is calculated when a table is opened, at
+      &show_table_status; and &analyze_table; and on other circumstances
+      (like when the table has changed too much). Note that all tables
+      are opened, and the statistics are re-estimated, when the
+      <literal>mysql</literal> client starts if the auto-rehash setting
+      is set on (the default). The auto-rehash feature enables automatic
+      name completion of database, table, and column names for
+      interactive users. You may prefer setting auto-rehash off to
+      improve the start up time of the <literal>mysql</literal> client.
     </para>
 
     <para>
-      You should note that it does not make sense to increase
-      the index sample size, then run &analyze_table; and decrease
-      sample size to attempt to obtain better statistics.
-      This is because the statistics are not persistent. They are
-      automatically recalculated at various times other than on
-      execution of &analyze_table;. Sooner or later the
-      <quote>better</quote> statistics calculated by
-      <code>ANALYZE</code> running with a high value of
-      &innodb_stats_sample_pages; will be wiped away.
+      You should note that it does not make sense to increase the index
+      sample size, then run &analyze_table; and decrease sample size to
+      attempt to obtain better statistics. This is because the
+      statistics are not persistent. They are automatically recalculated
+      at various times other than on execution of &analyze_table;.
+      Sooner or later the <quote>better</quote> statistics calculated by
+
+      <code>ANALYZE</code>
+
+      running with a high value of &innodb_stats_sample_pages; will be
+      wiped away.
     </para>
 
     <para>
-      The estimated cardinality for an index will be more accurate
-      with a larger number of samples, but each sample might require
-      a disk read, so you do not want to make the sample size too
-      large. You should choose a value for &innodb_stats_sample_pages;
-      that results in reasonably accurate estimates for all tables in
-      your database without requiring excessive I/O.
+      The estimated cardinality for an index will be more accurate with
+      a larger number of samples, but each sample might require a disk
+      read, so you do not want to make the sample size too large. You
+      should choose a value for &innodb_stats_sample_pages; that results
+      in reasonably accurate estimates for all tables in your database
+      without requiring excessive I/O.
     </para>
 
     <para>
       Although it is not possible to specify the sample size on a
       per-table basis, smaller tables generally would require fewer
-      index samples than larger tables require. If your database
-      has many large tables, you may want to consider using a higher
-      value for &innodb_stats_sample_pages; than if you have mostly
-      smaller tables.
+      index samples than larger tables require. If your database has
+      many large tables, you may want to consider using a higher value
+      for &innodb_stats_sample_pages; than if you have mostly smaller
+      tables.
     </para>
+
   </section>
 
   <section id="innodb-other-changes-drop-index">
+
     <title>Better Error Handling when Dropping Indexes</title>
 
-    <para>For efficiency, &innodb; requires an index to exist on
-    foreign key columns so that <literal>UPDATE</literal> and
-    <literal>DELETE</literal> operations on a <quote>parent</quote>
-    table can easily check for the existence or non-existence of
-    corresponding rows in the <quote>child</quote> table.  To ensure
-    that there is an appropriate index for such checks, &mysql; will
-    sometimes implicitly create or drop such indexes as a side-effect
-    of <literal>CREATE TABLE</literal>, <literal>CREATE
-    INDEX</literal>, and <literal>ALTER TABLE</literal>
-    statements.</para>
+    <para>
+      For efficiency, &innodb; requires an index to exist on foreign key
+      columns so that <literal>UPDATE</literal> and
+      <literal>DELETE</literal> operations on a <quote>parent</quote>
+      table can easily check for the existence or non-existence of
+      corresponding rows in the <quote>child</quote> table. To ensure
+      that there is an appropriate index for such checks, &mysql; will
+      sometimes implicitly create or drop such indexes as a side-effect
+      of <literal>CREATE TABLE</literal>, <literal>CREATE
+      INDEX</literal>, and <literal>ALTER TABLE</literal> statements.
+    </para>
 
-    <para>When you explicitly <literal>DROP</literal> an index,
-    &innodb; will check that an index suitable for referential
-    integrity checking will still exist following the
-    <literal>DROP</literal> of the index.  &innodb; will prevent you
-    from dropping the last usable index for enforcing any given
-    referential constraint.  Users have been confused by this
-    behavior, as reported in <ulink
+    <para>
+      When you explicitly <literal>DROP</literal> an index, &innodb;
+      will check that an index suitable for referential integrity
+      checking will still exist following the <literal>DROP</literal> of
+      the index. &innodb; will prevent you from dropping the last usable
+      index for enforcing any given referential constraint. Users have
+      been confused by this behavior, as reported in
+      <ulink
     url="http://bugs.mysql.com/bug.php?id=21395">MySQL Bug
-    #21395</ulink>.</para>
+      #21395</ulink>.
+    </para>
 
-    <para>In releases prior to &innodb_plugin; 1.0.2, attempts to drop
-    the only usable index would result in an error message such as
+    <para>
+      In releases prior to &innodb_plugin; 1.0.2, attempts to drop the
+      only usable index would result in an error message such as
 
-    <programlisting>ERROR 1025 (HY000): Error on rename of '<replaceable
+<programlisting>ERROR 1025 (HY000): Error on rename of '<replaceable
     >./db2/#sql-18eb_3</replaceable>'&#10;<!--
     -->to '<replaceable >./db2/foo</replaceable>'(errno: 150)</programlisting>
 
-    Beginning with &innodb_plugin; 1.0.2, this error condition is
-    reported with a more friendly message:
+      Beginning with &innodb_plugin; 1.0.2, this error condition is
+      reported with a more friendly message:
 
-    <programlisting>ERROR 1553 (HY000): Cannot drop index '<replaceable
+<programlisting>ERROR 1553 (HY000): Cannot drop index '<replaceable
     >fooIdx</replaceable>':&#10;<!--
-    -->needed in a foreign key constraint</programlisting></para>
+    -->needed in a foreign key constraint</programlisting>
+    </para>
 
-    <para>As a related matter, because all user data in &innodb; is
-    maintained in the so-called <quote>clustered index</quote> (or
-    primary key index), &innodb; ensures that there is such an index
-    for every table, even if the user does not declare an explicit
-    <literal>PRIMARY KEY</literal>.  In such cases, &innodb; will
-    create an implicit clustered index using the first columns of the
-    table that have been declared <literal>UNIQUE</literal> and
-    <literal>NOT NULL</literal>.</para>
+    <para>
+      As a related matter, because all user data in &innodb; is
+      maintained in the so-called <quote>clustered index</quote> (or
+      primary key index), &innodb; ensures that there is such an index
+      for every table, even if the user does not declare an explicit
+      <literal>PRIMARY KEY</literal>. In such cases, &innodb; will
+      create an implicit clustered index using the first columns of the
+      table that have been declared <literal>UNIQUE</literal> and
+      <literal>NOT NULL</literal>.
+    </para>
 
-    <para>When the &innodb_plugin; is used with a &mysql; version
-    earlier than 5.1.29, an attempt to drop an implicit clustered
-    index (the first <literal>UNIQUE NOT NULL</literal> index) will
-    fail if the table does not contain a <literal>PRIMARY
-    KEY</literal>.  This has been reported as <ulink
+    <para>
+      When the &innodb_plugin; is used with a &mysql; version earlier
+      than 5.1.29, an attempt to drop an implicit clustered index (the
+      first <literal>UNIQUE NOT NULL</literal> index) will fail if the
+      table does not contain a <literal>PRIMARY KEY</literal>. This has
+      been reported as
+      <ulink
     url="http://bugs.mysql.com/bug.php?id=31233">MySQL Bug
-    #31233</ulink>.  Attempts to use the &drop_index; or &alter_table;
-    command to drop such an index will generate this error:</para>
+      #31233</ulink>. Attempts to use the &drop_index; or &alter_table;
+      command to drop such an index will generate this error:
+    </para>
 
-    <programlisting
+<programlisting
     >ERROR 42000: This table type requires a primary key</programlisting>
 
-    <para>Beginning with &mysql; 5.1.29 when using the
-    &innodb_plugin;, attempts to drop such an index will copy the
-    table, rebuilding the index using a different <literal>UNIQUE NOT
-    NULL</literal> group of columns or a system-generated key.  Note
-    that all indexes will be re-created by copying the table, as
-    described in <xref
-    linkend="innodb-create-index-implementation"/>.</para>
+    <para>
+      Beginning with &mysql; 5.1.29 when using the &innodb_plugin;,
+      attempts to drop such an index will copy the table, rebuilding the
+      index using a different <literal>UNIQUE NOT NULL</literal> group
+      of columns or a system-generated key. Note that all indexes will
+      be re-created by copying the table, as described in
+      <xref
+    linkend="innodb-create-index-implementation"/>.
+    </para>
 
-    <para>In those versions of &mysql; that are affected by this bug,
-    one way to change an index of this type is to create a new table
-    and copy the data into it using <literal>INSERT INTO
-    <replaceable>newtable</replaceable> SELECT * FROM
-    <replaceable>oldtable</replaceable></literal>, and then
-    <literal>DROP</literal> the old table and rename the new
-    table.</para>
+    <para>
+      In those versions of &mysql; that are affected by this bug, one
+      way to change an index of this type is to create a new table and
+      copy the data into it using <literal>INSERT INTO
+      <replaceable>newtable</replaceable> SELECT * FROM
+      <replaceable>oldtable</replaceable></literal>, and then
+      <literal>DROP</literal> the old table and rename the new table.
+    </para>
 
-    <para>However, if there are existing tables with references to the
-    table whose index you are dropping, you will first need to use the
-    &alter_table; command to remove foreign key references from or to
-    other tables.  Unfortunately, &mysql; does not support dropping or
-    creating &foreign_key; constraints, even though dropping a
-    constraint would be trivial.  Therefore, if you use &alter_table;
-    to add or remove a &references; constraint, the
-    child table will be copied, rather than using <quote>Fast Index
-    Creation</quote>.</para>
+    <para>
+      However, if there are existing tables with references to the table
+      whose index you are dropping, you will first need to use the
+      &alter_table; command to remove foreign key references from or to
+      other tables. Unfortunately, &mysql; does not support dropping or
+      creating &foreign_key; constraints, even though dropping a
+      constraint would be trivial. Therefore, if you use &alter_table;
+      to add or remove a &references; constraint, the child table will
+      be copied, rather than using <quote>Fast Index Creation</quote>.
+    </para>
+
   </section>
 
   <section id="innodb-other-changes-show-mutex">
+
     <title>More Compact Output of &show_innodb_mutex;</title>
 
     <indexterm>
       <primary>&show_innodb_mutex;</primary>
     </indexterm>
 
-    <para>The command &show_innodb_mutex; displays information
-    about &innodb; mutexes and rw-locks.  It can be a useful
-    tuning aid on multi-core systems.  However, with a big buffer
-    pool, the size of the output may be overwhelming.  There is a
-    mutex and rw-lock in each 16K buffer pool block.  It is highly
-    improbable that an individual block mutex or rw-lock could become
-    a performance bottleneck, and there are 65,536 blocks per
-    gigabyte.</para>
+    <para>
+      The command &show_innodb_mutex; displays information about
+      &innodb; mutexes and rw-locks. It can be a useful tuning aid on
+      multi-core systems. However, with a big buffer pool, the size of
+      the output may be overwhelming. There is a mutex and rw-lock in
+      each 16K buffer pool block. It is highly improbable that an
+      individual block mutex or rw-lock could become a performance
+      bottleneck, and there are 65,536 blocks per gigabyte.
+    </para>
 
-    <para>Starting with &innodb_plugin; 1.0.4, &show_innodb_mutex;
-    will skip the mutexes and rw-locks of buffer pool blocks.
-    Furthermore, it will not list any mutexes or rw-locks that have
-    never been waited on (<literal>os_waits=0</literal>). Therefore,
-    &show_innodb_mutex; only displays information about such mutexes
-    and rw-locks that does not belong to the buffer pool blocks and
-    for whom there have been at least one OS level wait. </para>
+    <para>
+      Starting with &innodb_plugin; 1.0.4, &show_innodb_mutex; will skip
+      the mutexes and rw-locks of buffer pool blocks. Furthermore, it
+      will not list any mutexes or rw-locks that have never been waited
+      on (<literal>os_waits=0</literal>). Therefore, &show_innodb_mutex;
+      only displays information about such mutexes and rw-locks that
+      does not belong to the buffer pool blocks and for whom there have
+      been at least one OS level wait.
+    </para>
+
   </section>
 
   <section id="innodb-other-changes-readahead-counters">
+
     <title>More Read Ahead Statistics</title>
 
     <indexterm>
       <primary>read ahead</primary>
     </indexterm>
 
-    <para>As described in <xref linkend="innodb-performance-read_ahead"/>
-    a read ahead request is an asynchronous IO request issued in
-    anticipation that the page being read in will be used in near
-    future. It can be very useful if a DBA has the information
-    about how many pages are read in as part of read ahead and how many
-    of them are evicted from the buffer pool without ever being
-    accessed. Based on this information a DBA can then fine tune the
-    degree of aggressiveness of the read ahead using the parameter
-    &innodb_read_ahead_threshold;.</para>
+    <para>
+      As described in <xref linkend="innodb-performance-read_ahead"/> a
+      read ahead request is an asynchronous IO request issued in
+      anticipation that the page being read in will be used in near
+      future. It can be very useful if a DBA has the information about
+      how many pages are read in as part of read ahead and how many of
+      them are evicted from the buffer pool without ever being accessed.
+      Based on this information a DBA can then fine tune the degree of
+      aggressiveness of the read ahead using the parameter
+      &innodb_read_ahead_threshold;.
+    </para>
 
-    <para>Starting from &innodb_plugin; 1.0.5 two new status variables
-    are added to the <literal>SHOW STATUS</literal> output. These
-    global status variables <literal>Innodb_buffer_pool_read_ahead</literal>
-    and <literal>Innodb_buffer_pool_read_ahead_evicted</literal>
-    indicate the number of pages read in as part of read ahead and the
-    number of such pages evicted without ever being accessed
-    respectively. These counters provide global values since the start
-    of the server. Please also note that the status variables
-    <literal>Innodb_buffer_pool_read_ahead_rnd</literal> and
-    <literal>Innodb_buffer_pool_read_ahead_seq</literal> have been
-    removed from the <literal>SHOW STATUS</literal> output.</para>
+    <para>
+      Starting from &innodb_plugin; 1.0.5 two new status variables are
+      added to the <literal>SHOW STATUS</literal> output. These global
+      status variables <literal>Innodb_buffer_pool_read_ahead</literal>
+      and <literal>Innodb_buffer_pool_read_ahead_evicted</literal>
+      indicate the number of pages read in as part of read ahead and the
+      number of such pages evicted without ever being accessed
+      respectively. These counters provide global values since the start
+      of the server. Please also note that the status variables
+      <literal>Innodb_buffer_pool_read_ahead_rnd</literal> and
+      <literal>Innodb_buffer_pool_read_ahead_seq</literal> have been
+      removed from the <literal>SHOW STATUS</literal> output.
+    </para>
 
-    <para>In addition to the two counters mentioned above
-    <literal>SHOW INNODB STATUS</literal> will also show the rate at
-    which the read ahead pages are being read in and the rate at
-    which such pages are being evicted without being accessed. The per
-    second averages are based on the statistics collected since the last
-    invocation of <literal>SHOW INNODB STATUS</literal> and are
-    displayed in the <literal>BUFFER POOL AND MEMORY</literal> section
-    of the output.</para>
+    <para>
+      In addition to the two counters mentioned above <literal>SHOW
+      INNODB STATUS</literal> will also show the rate at which the read
+      ahead pages are being read in and the rate at which such pages are
+      being evicted without being accessed. The per second averages are
+      based on the statistics collected since the last invocation of
+      <literal>SHOW INNODB STATUS</literal> and are displayed in the
+      <literal>BUFFER POOL AND MEMORY</literal> section of the output.
+    </para>
+
   </section>
 
 </chapter>
-
 <!-- vim: set sw=2 tw=72: -->


Modified: trunk/innodb-plugin-1.0/innodb-parameter-changes.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-parameter-changes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-parameter-changes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 471, Lines Deleted: 318; 32791 bytes

@@ -6,319 +6,469 @@
   %innodb.entities;
 ]>
 <appendix id="innodb-parameter-changes">
+
   <title>List of Parameters Changed in the &innodb_plugin; 1.0</title>
 
   <section id="innodb-parameters-new">
+
     <title>New Parameters</title>
 
-    <para>Throughout the course of development, the &innodb_plugin;
-    has introduced new configuration parameters. The following
-    table summarizes those parameters:</para>
+    <para>
+      Throughout the course of development, the &innodb_plugin; has
+      introduced new configuration parameters. The following table
+      summarizes those parameters:
+    </para>
 
     <table id="innodb-new-parameter-summary-table">
-	<title>&innodb_plugin; New Parameter Summary</title>
-	<tgroup cols="7">
-	  <colspec colnum="1" colwidth="20*"/>
-	  <colspec colnum="2" colwidth="4*"/>
-	  <colspec colnum="3" colwidth="4*"/>
-	  <colspec colnum="4" colwidth="4*"/>
-	  <colspec colnum="5" colwidth="5*"/>
-	  <colspec colnum="6" colwidth="5*"/>
-	  <colspec colnum="7" colwidth="6*"/>
-	  <thead>
-	    <row>
-	      <entry>Name</entry>
-	      <entry>Cmd-Line</entry>
-	      <entry>Option File</entry>
-	      <entry>System Var</entry>
-	      <entry>Scope</entry>
-	      <entry>Dynamic</entry>
-	      <entry>Default</entry>
-	    </row>
-	  </thead>
-	  <tbody>
-	    <row>
-	      <entry><literal>innodb_adaptive_flushing</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>TRUE</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_change_buffering</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>inserts</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_file_format</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>Antelope</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_file_format_check</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>ON</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_io_capacity</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>200</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_old_blocks_pct</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>37</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_old_blocks_time</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>0</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_read_ahead_threshold</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>56</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_read_io_threads</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>NO</literal></entry>
-	      <entry><literal>4</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_spin_wait_delay</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>6</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_stats_sample_pages</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>8</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_strict_mode</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL|SESSION</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>FALSE</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_use_sys_malloc</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>NO</literal></entry>
-	      <entry><literal>TRUE</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_write_io_threads</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>YES</literal></entry>
-	      <entry><literal>GLOBAL</literal></entry>
-	      <entry><literal>NO</literal></entry>
-	      <entry><literal>4</literal></entry>
-	    </row>
-	  </tbody>
-	</tgroup>
+      <title>&innodb_plugin; New Parameter Summary</title>
+      <tgroup cols="7">
+        <colspec colnum="1" colwidth="20*"/>
+        <colspec colnum="2" colwidth="4*"/>
+        <colspec colnum="3" colwidth="4*"/>
+        <colspec colnum="4" colwidth="4*"/>
+        <colspec colnum="5" colwidth="5*"/>
+        <colspec colnum="6" colwidth="5*"/>
+        <colspec colnum="7" colwidth="6*"/>
+        <thead>
+          <row>
+            <entry>Name</entry>
+            <entry>Cmd-Line</entry>
+            <entry>Option File</entry>
+            <entry>System Var</entry>
+            <entry>Scope</entry>
+            <entry>Dynamic</entry>
+            <entry>Default</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><literal>innodb_adaptive_flushing</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>TRUE</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_change_buffering</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>inserts</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_file_format</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>Antelope</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_file_format_check</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>ON</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_io_capacity</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>200</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_old_blocks_pct</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>37</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_old_blocks_time</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>0</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_read_ahead_threshold</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>56</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_read_io_threads</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>NO</literal></entry>
+            <entry><literal>4</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_spin_wait_delay</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>6</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_stats_sample_pages</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>8</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_strict_mode</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL|SESSION</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>FALSE</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_use_sys_malloc</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>NO</literal></entry>
+            <entry><literal>TRUE</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_write_io_threads</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>YES</literal></entry>
+            <entry><literal>GLOBAL</literal></entry>
+            <entry><literal>NO</literal></entry>
+            <entry><literal>4</literal></entry>
+          </row>
+        </tbody>
+      </tgroup>
     </table>
 
-
     <indexterm>
       <primary>parameters, new</primary>
     </indexterm>
 
     <variablelist>
-      <?dbfo term-width="2.5in"?>
-      <varlistentry><term>&innodb_adaptive_flushing;</term>
-      <listitem><para>Whether &innodb; uses a new algorithm to
-      estimate the required rate of flushing. The default value is
-      <literal>TRUE</literal>. This parameter was added in
-      &innodb_plugin; 1.0.4.
-      See <xref linkend="innodb-performance-adaptive_flushing"/> for
-      more information.</para></listitem></varlistentry>
 
-      <varlistentry><term>&innodb_change_buffering;</term>
-      <listitem><para>Whether &innodb; performs insert buffering.
-      The default value is <literal>"inserts"</literal> (buffer insert
-      operations). This parameter was added in &innodb_plugin; 1.0.3.
-      See <xref linkend="innodb-performance-change_buffering"/>
-      for more information.</para></listitem></varlistentry>
+<?dbfo term-width="2.5in"?>
 
-      <varlistentry><term>&innodb_file_format;</term>
-      <listitem><para>Whether to enable the new &q.barracuda; file
-      format. The default value is &q.antelope;.  This parameter was
-      added in &innodb_plugin; 1.0.1. See
-      <xref linkend="innodb-file-format-enabling"/> for more
-      information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_adaptive_flushing;
+        </term>
 
-      <varlistentry><term>&innodb_file_format_check;</term>
-      <listitem><para>Whether &innodb; performs file format
-      compatibility checking when opening a database. The default
-      value is <literal>ON</literal>. This parameter was added in
-      &innodb_plugin; 1.0.1. See
-      <xref linkend="innodb-file-format-compatibility-checking"/>
-      for more information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            Whether &innodb; uses a new algorithm to estimate the
+            required rate of flushing. The default value is
+            <literal>TRUE</literal>. This parameter was added in
+            &innodb_plugin; 1.0.4. See
+            <xref linkend="innodb-performance-adaptive_flushing"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <varlistentry><term>&innodb_io_capacity;</term>
-      <listitem><para>The number of <literal>I/O</literal>
-      operations that can be performed per second. The allowable value
-      range is any number 100 or greater, and the default value
-      is <literal>200</literal>. This parameter was added in
-      &innodb_plugin; 1.0.4. To reproduce the earlier behavior,
-      use a value of 100.
-      See <xref linkend="innodb-performance-thread_io_rate"/>
-      for more information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_change_buffering;
+        </term>
 
-      <varlistentry><term>&innodb_old_blocks_pct;</term>
-      <listitem><para>Controls the desired percentage of <quote>old</quote>
-      blocks in the LRU list of the buffer pool.  The default value is
-      <literal>37</literal> and the allowable value range is
-      <literal>5 to 95</literal>. This parameter was added in
-      &innodb_plugin; 1.0.5.
-      See <xref linkend="innodb-performance-midpoint_insertion"/>
-      for more information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            Whether &innodb; performs insert buffering. The default
+            value is <literal>"inserts"</literal> (buffer insert
+            operations). This parameter was added in &innodb_plugin;
+            1.0.3. See
+            <xref linkend="innodb-performance-change_buffering"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <varlistentry><term>&innodb_old_blocks_time;</term>
-      <listitem><para>The time in milliseconds since the first access to a
-      block during which it can be accessed again without being made
-      <quote>young</quote>. The default value is <literal>0</literal>
-      which means that blocks are moved to the <quote>young</quote>
-      end of the LRU list at the first access. This parameter
-      was added in &innodb_plugin; 1.0.5.
-      See <xref linkend="innodb-performance-midpoint_insertion"/>
-      for more information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_file_format;
+        </term>
 
-      <varlistentry><term>&innodb_read_ahead_threshold;</term>
-      <listitem><para>Control the sensitivity of the linear read ahead.
-      The allowable value range
-      is <literal>0</literal> to <literal>64</literal> and the
-      default value is <literal>56</literal>. This parameter was added
-      in &innodb_plugin; 1.0.4. See
-      <xref linkend="innodb-performance-read_ahead"/> for more
-      information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            Whether to enable the new &q.barracuda; file format. The
+            default value is &q.antelope;. This parameter was added in
+            &innodb_plugin; 1.0.1. See
+            <xref linkend="innodb-file-format-enabling"/> for more
+            information.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <varlistentry><term>&innodb_read_io_threads;</term>
-      <listitem><para>The number of background <literal>I/O</literal>
-      threads used for reads. The allowable value range
-      is <literal>1</literal> to <literal>64</literal> and the default
-      value is
-      <literal>4</literal>. This parameter was added in
-      &innodb_plugin; 1.0.4. See
-      <xref linkend="innodb-performance-multiple_io_threads"/> for more
-      information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_file_format_check;
+        </term>
 
-      <varlistentry><term>&innodb_spin_wait_delay;</term>
-      <listitem><para>Maximum delay between polling for a spin lock.  The
-      allowable value range is <literal>0</literal> (meaning
-      unlimited) or positive integers and the default value
-      is <literal>6</literal>. This parameter was added in
-      &innodb_plugin; 1.0.4. See
-      <xref linkend="innodb-performance-spin_lock_polling"/> for more
-      information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            Whether &innodb; performs file format compatibility checking
+            when opening a database. The default value is
+            <literal>ON</literal>. This parameter was added in
+            &innodb_plugin; 1.0.1. See
+            <xref linkend="innodb-file-format-compatibility-checking"/>
+            for more information.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <varlistentry><term>&innodb_stats_sample_pages;</term>
-      <listitem><para>The number of index pages to sample when calculating
-      statistics. The allowable value range is
-      <literal>1-unlimited</literal> and the default value is
-      <literal>8</literal>. This parameter was added in &innodb_plugin;
-      1.0.2. See
-      <xref linkend="innodb-other-changes-statistics-estimation"/> for
-      more information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_io_capacity;
+        </term>
 
-      <varlistentry><term>&innodb_strict_mode;</term>
-      <listitem><para>Whether &innodb; raises error conditions in
-      certain cases, rather than issuing a warning. The default value is
-      <literal>OFF</literal>. This parameter was added in
-      &innodb_plugin; 1.0.2. See
-      <xref linkend="innodb-other-changes-strict-mode"/> for more
-      information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            The number of <literal>I/O</literal> operations that can be
+            performed per second. The allowable value range is any
+            number 100 or greater, and the default value is
+            <literal>200</literal>. This parameter was added in
+            &innodb_plugin; 1.0.4. To reproduce the earlier behavior,
+            use a value of 100. See
+            <xref linkend="innodb-performance-thread_io_rate"/> for more
+            information.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <varlistentry><term>&innodb_use_sys_malloc;</term>
-      <listitem><para>Whether &innodb; uses its own memory allocator
-      or an allocator of the operating system. The default value is
-      <literal>ON</literal> (use an allocator of the underlying
-      system). This parameter was added in &innodb_plugin; 1.0.3. See
-      <xref linkend="innodb-performance-use_sys_malloc"/> for more
-      information.</para></listitem></varlistentry>
+      <varlistentry>
+        <term>
+          &innodb_old_blocks_pct;
+        </term>
 
-      <varlistentry><term>&innodb_write_io_threads;</term>
-      <listitem><para>The number of background <literal>I/O</literal>
-      threads used for writes.  The allowable value range
-      is <literal>1</literal> to <literal>64</literal> and the default
-      value is <literal>4</literal>.  This parameter was added in
-      &innodb_plugin; 1.0.4. See
-      <xref linkend="innodb-performance-multiple_io_threads"/> for more
-      information.</para></listitem></varlistentry>
+        <listitem>
+          <para>
+            Controls the desired percentage of <quote>old</quote> blocks
+            in the LRU list of the buffer pool. The default value is
+            <literal>37</literal> and the allowable value range is
+            <literal>5 to 95</literal>. This parameter was added in
+            &innodb_plugin; 1.0.5. See
+            <xref linkend="innodb-performance-midpoint_insertion"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_old_blocks_time;
+        </term>
+
+        <listitem>
+          <para>
+            The time in milliseconds since the first access to a block
+            during which it can be accessed again without being made
+            <quote>young</quote>. The default value is
+            <literal>0</literal> which means that blocks are moved to
+            the <quote>young</quote> end of the LRU list at the first
+            access. This parameter was added in &innodb_plugin; 1.0.5.
+            See <xref linkend="innodb-performance-midpoint_insertion"/>
+            for more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_read_ahead_threshold;
+        </term>
+
+        <listitem>
+          <para>
+            Control the sensitivity of the linear read ahead. The
+            allowable value range is <literal>0</literal> to
+            <literal>64</literal> and the default value is
+            <literal>56</literal>. This parameter was added in
+            &innodb_plugin; 1.0.4. See
+            <xref linkend="innodb-performance-read_ahead"/> for more
+            information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_read_io_threads;
+        </term>
+
+        <listitem>
+          <para>
+            The number of background <literal>I/O</literal> threads used
+            for reads. The allowable value range is <literal>1</literal>
+            to <literal>64</literal> and the default value is
+            <literal>4</literal>. This parameter was added in
+            &innodb_plugin; 1.0.4. See
+            <xref linkend="innodb-performance-multiple_io_threads"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_spin_wait_delay;
+        </term>
+
+        <listitem>
+          <para>
+            Maximum delay between polling for a spin lock. The allowable
+            value range is <literal>0</literal> (meaning unlimited) or
+            positive integers and the default value is
+            <literal>6</literal>. This parameter was added in
+            &innodb_plugin; 1.0.4. See
+            <xref linkend="innodb-performance-spin_lock_polling"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_stats_sample_pages;
+        </term>
+
+        <listitem>
+          <para>
+            The number of index pages to sample when calculating
+            statistics. The allowable value range is
+            <literal>1-unlimited</literal> and the default value is
+            <literal>8</literal>. This parameter was added in
+            &innodb_plugin; 1.0.2. See
+            <xref linkend="innodb-other-changes-statistics-estimation"/>
+            for more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_strict_mode;
+        </term>
+
+        <listitem>
+          <para>
+            Whether &innodb; raises error conditions in certain cases,
+            rather than issuing a warning. The default value is
+            <literal>OFF</literal>. This parameter was added in
+            &innodb_plugin; 1.0.2. See
+            <xref linkend="innodb-other-changes-strict-mode"/> for more
+            information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_use_sys_malloc;
+        </term>
+
+        <listitem>
+          <para>
+            Whether &innodb; uses its own memory allocator or an
+            allocator of the operating system. The default value is
+            <literal>ON</literal> (use an allocator of the underlying
+            system). This parameter was added in &innodb_plugin; 1.0.3.
+            See <xref linkend="innodb-performance-use_sys_malloc"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          &innodb_write_io_threads;
+        </term>
+
+        <listitem>
+          <para>
+            The number of background <literal>I/O</literal> threads used
+            for writes. The allowable value range is
+            <literal>1</literal> to <literal>64</literal> and the
+            default value is <literal>4</literal>. This parameter was
+            added in &innodb_plugin; 1.0.4. See
+            <xref linkend="innodb-performance-multiple_io_threads"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
+
   </section>
 
   <section id="innodb-parameters-deprecated">
+
     <title>Deprecated Parameters</title>
 
     <indexterm>
       <primary>parameters, deprecated</primary>
     </indexterm>
 
-    <para>Beginning in &innodb_plugin; 1.0.4 the following configuration
-    parameter has been removed:</para>
+    <para>
+      Beginning in &innodb_plugin; 1.0.4 the following configuration
+      parameter has been removed:
+    </para>
 
     <variablelist>
-      <?dbfo term-width="2.5in"?>
-      <varlistentry><term>&innodb_file_io_threads;</term>
-      <listitem><para>This parameter has been replaced by two new
-      parameters <literal>&innodb_read_io_threads;</literal> and
-      <literal>&innodb_write_io_threads;</literal>.
-      See <xref linkend="innodb-performance-multiple_io_threads"/>
-      for more information.</para></listitem></varlistentry>
+
+<?dbfo term-width="2.5in"?>
+
+      <varlistentry>
+        <term>
+          &innodb_file_io_threads;
+        </term>
+
+        <listitem>
+          <para>
+            This parameter has been replaced by two new parameters
+            <literal>&innodb_read_io_threads;</literal> and
+            <literal>&innodb_write_io_threads;</literal>. See
+            <xref linkend="innodb-performance-multiple_io_threads"/> for
+            more information.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
+
   </section>
 
   <section id="innodb-parameters-new-defaults">
+
     <title>Parameters with New Defaults</title>
 
     <indexterm>

@@ -355,57 +505,60 @@
       <secondary>&innodb_thread_concurrency;</secondary>
     </indexterm>
 
-    <para>For better out-of-the-box performance, &innodb_plugin; 1.0.4
-    changes the default values for the following configuration
-    parameters:</para>
+    <para>
+      For better out-of-the-box performance, &innodb_plugin; 1.0.4
+      changes the default values for the following configuration
+      parameters:
+    </para>
 
     <table id="innodb-parameters-new-defaults-table">
-	<title>&innodb_plugin; Parameters with New Defaults</title>
-	<tgroup cols="3">
-	  <colspec colnum="1" align="left" colwidth="20*"/>
-	  <colspec colnum="2" align="right" colwidth="10*"/>
-	  <colspec colnum="3" align="right" colwidth="10*"/>
-	  <thead>
-	    <row>
-	      <entry>Name</entry>
-	      <entry>Old Default</entry>
-	      <entry>New Default</entry>
-	    </row>
-	  </thead>
-	  <tbody>
-	    <row>
-	      <entry><literal>innodb_additional_mem_pool_size</literal></entry>
-	      <entry><literal>1MB</literal></entry>
-	      <entry><literal>8MB</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_buffer_pool_size</literal></entry>
-	      <entry><literal>8MB</literal></entry>
-	      <entry><literal>128MB</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_log_buffer_size</literal></entry>
-	      <entry><literal>1MB</literal></entry>
-	      <entry><literal>8MB</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_max_dirty_pages_pct</literal></entry>
-	      <entry><literal>90</literal></entry>
-	      <entry><literal>75</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_sync_spin_loops</literal></entry>
-	      <entry><literal>20</literal></entry>
-	      <entry><literal>30</literal></entry>
-	    </row>
-	    <row>
-	      <entry><literal>innodb_thread_concurrency</literal></entry>
-	      <entry><literal>8</literal></entry>
-	      <entry><literal>0</literal></entry>
-	    </row>
-	  </tbody>
-	</tgroup>
+      <title>&innodb_plugin; Parameters with New Defaults</title>
+      <tgroup cols="3">
+        <colspec colnum="1" align="left" colwidth="20*"/>
+        <colspec colnum="2" align="right" colwidth="10*"/>
+        <colspec colnum="3" align="right" colwidth="10*"/>
+        <thead>
+          <row>
+            <entry>Name</entry>
+            <entry>Old Default</entry>
+            <entry>New Default</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><literal>innodb_additional_mem_pool_size</literal></entry>
+            <entry><literal>1MB</literal></entry>
+            <entry><literal>8MB</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_buffer_pool_size</literal></entry>
+            <entry><literal>8MB</literal></entry>
+            <entry><literal>128MB</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_log_buffer_size</literal></entry>
+            <entry><literal>1MB</literal></entry>
+            <entry><literal>8MB</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_max_dirty_pages_pct</literal></entry>
+            <entry><literal>90</literal></entry>
+            <entry><literal>75</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_sync_spin_loops</literal></entry>
+            <entry><literal>20</literal></entry>
+            <entry><literal>30</literal></entry>
+          </row>
+          <row>
+            <entry><literal>innodb_thread_concurrency</literal></entry>
+            <entry><literal>8</literal></entry>
+            <entry><literal>0</literal></entry>
+          </row>
+        </tbody>
+      </tgroup>
     </table>
 
   </section>
+
 </appendix>


Modified: trunk/innodb-plugin-1.0/innodb-plugin-glossary.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-plugin-glossary.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-plugin-glossary.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 5; 760 bytes

@@ -8,12 +8,14 @@
 %innodb.glossary;
 ]>
 <glossary id="glossary">
-<title>&innodb_plugin; Glossary</title>
-<para>
-These terms are commonly used in information about the &innodb_plugin; product
-and InnoDB in general.
-</para>
 
+  <title>&innodb_plugin; Glossary</title>
+
+  <para>
+    These terms are commonly used in information about the
+    &innodb_plugin; product and InnoDB in general.
+  </para>
+
 &glos_antelope;
 &glos_barracuda;
 &glos_compact_row_format;


Modified: trunk/innodb-plugin-1.0/innodb-row-format.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-row-format.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-row-format.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 59, Lines Deleted: 57; 9297 bytes

@@ -6,33 +6,34 @@
   %innodb.entities;
 ]>
 <chapter id="innodb-row-format">
+
   <title>Storage of Variable-Length Columns</title>
 
   <section id="innodb-row-format-overview">
+
     <title>Overview</title>
 
     <para>
-      All data in &innodb; is stored in database pages comprising
-      a B-tree index (the so-called clustered index or primary key
-      index). The essential idea is that the nodes of the B-tree
-      contain, for each primary key value (whether user-specified or
-      generated or chosen by the system), the values of the remaining
-      columns of the row as well as the key. In some other database
-      systems, a clustered index is called an
-      <quote>index-organized table</quote>. Secondary indexes in &innodb;
-      are also B-trees, containing pairs of values of the index key and
-      the value of the primary key, which acts as a pointer to the row
-      in the clustered index.
+      All data in &innodb; is stored in database pages comprising a
+      B-tree index (the so-called clustered index or primary key index).
+      The essential idea is that the nodes of the B-tree contain, for
+      each primary key value (whether user-specified or generated or
+      chosen by the system), the values of the remaining columns of the
+      row as well as the key. In some other database systems, a
+      clustered index is called an <quote>index-organized table</quote>.
+      Secondary indexes in &innodb; are also B-trees, containing pairs
+      of values of the index key and the value of the primary key, which
+      acts as a pointer to the row in the clustered index.
     </para>
 
     <para>
-      There is an exception to this rule.  Variable-length columns
-      (such as <literal>BLOB</literal> and <literal>VARCHAR</literal>)
-      that are too long to fit on a B-tree page are stored on separately
-      allocated disk (<quote>overflow</quote>) pages.  We call these
-      <quote>off-page columns</quote>.  The values of such columns are
+      There is an exception to this rule. Variable-length columns (such
+      as <literal>BLOB</literal> and <literal>VARCHAR</literal>) that
+      are too long to fit on a B-tree page are stored on separately
+      allocated disk (<quote>overflow</quote>) pages. We call these
+      <quote>off-page columns</quote>. The values of such columns are
       stored on singly-linked lists of overflow pages, and each such
-      column has its own list of one or more overflow pages.  In some
+      column has its own list of one or more overflow pages. In some
       cases, all or a prefix of the long column values is stored in the
       B-tree, to avoid wasting storage and eliminating the need to read
       a separate page.

@@ -40,67 +41,68 @@
 
     <para>
       The new &q.barracuda; file format provides a new option
-      (<literal>KEY_BLOCK_SIZE</literal>) to
-      control how much column data is stored in the clustered index, and
-      how much is placed on overflow pages.
+      (<literal>KEY_BLOCK_SIZE</literal>) to control how much column
+      data is stored in the clustered index, and how much is placed on
+      overflow pages.
     </para>
+
   </section>
 
   <section id="innodb-row-format-antelope">
-    <title>
-      &compact; and &redundant;
-      Row Format
-    </title>
 
+    <title>&compact; and &redundant; Row Format</title>
+
     <indexterm>
       <primary>&row_format;</primary>
       <secondary>&compact;</secondary>
     </indexterm>
+
     <indexterm>
       <primary>&row_format;</primary>
       <secondary>&redundant;</secondary>
     </indexterm>
 
     <para>
-      Previous versions of &innodb; used an unnamed file format
-      (now called &q.antelope;) for database files.  With that format,
-      tables were defined with &row_format_compact; (or
-      &row_format_redundant;) and &innodb; stored up to
-      the first 768 bytes of variable-length columns (such as
-      <literal>BLOB</literal> and <literal>VARCHAR</literal>) in the
-      index record within the B-tree node, with the remainder stored on
-      the overflow page(s).
+      Previous versions of &innodb; used an unnamed file format (now
+      called &q.antelope;) for database files. With that format, tables
+      were defined with &row_format_compact; (or &row_format_redundant;)
+      and &innodb; stored up to the first 768 bytes of variable-length
+      columns (such as <literal>BLOB</literal> and
+      <literal>VARCHAR</literal>) in the index record within the B-tree
+      node, with the remainder stored on the overflow page(s).
     </para>
 
     <para>
       To preserve compatibility with those prior versions, tables
       created with the &innodb_plugin; use the prefix format, unless one
-      of &row_format_dynamic; or
-      &row_format_compressed; is specified (or implied)
-      on the &create_table; command.
+      of &row_format_dynamic; or &row_format_compressed; is specified
+      (or implied) on the &create_table; command.
     </para>
 
     <para>
-      With the &q.antelope; file format, if the value of a column
-      is not longer than 768 bytes, no overflow page is needed, and some
+      With the &q.antelope; file format, if the value of a column is not
+      longer than 768 bytes, no overflow page is needed, and some
       savings in i/o may result, since the value is in the B-tree node.
       This works well for relatively short <literal>BLOB</literal>s, but
       may cause B-tree nodes to fill with data rather than key values,
-      thereby reducing their efficiency.  Tables with many
+      thereby reducing their efficiency. Tables with many
       <literal>BLOB</literal> columns could cause B-tree nodes to become
       too full of data, and contain too few rows, making the entire
       index less efficient than if the rows were shorter or if the
       column values were stored off-page.
     </para>
+
   </section>
 
   <section id="innodb-row-format-dynamic">
+
     <title>&dynamic; Row Format</title>
 
     <indexterm>
       <primary>&row_format;</primary>
       <secondary>&dynamic;</secondary>
     </indexterm>
+
     <indexterm>
       <primary>&row_format;</primary>
       <secondary>&compressed;</secondary>

@@ -108,16 +110,16 @@
 
     <para>
       When &innodb_file_format; is set to &q.barracuda; and a table is
-      created with &row_format_dynamic; or &row_format_compressed;,
-      long column values are stored fully off-page, and the clustered
-      index record contains only a 20-byte pointer to the overflow page.
+      created with &row_format_dynamic; or &row_format_compressed;, long
+      column values are stored fully off-page, and the clustered index
+      record contains only a 20-byte pointer to the overflow page.
     </para>
 
     <para>
-      Whether any columns are stored off-page depends on the page
-      size and the total size of the row. When the row is too long,
-      &innodb; chooses the longest columns for off-page storage
-      until the clustered index record fits on the B-tree page.
+      Whether any columns are stored off-page depends on the page size
+      and the total size of the row. When the row is too long, &innodb;
+      chooses the longest columns for off-page storage until the
+      clustered index record fits on the B-tree page.
     </para>
 
     <para>

@@ -125,16 +127,17 @@
       entire row in the index node if it fits (as do the &compact; and
       &redundant; formats), but this new format avoids the problem of
       filling B-tree nodes with a large number of data bytes of long
-      columns. The &dynamic; format is predicated on
-      the idea that if a portion of a long data value is stored
-      off-page, it is usually most efficient to store all of the value
-      off-page. With &dynamic; format, shorter columns
-      are likely to remain in the B-tree node, minimizing the number of
-      overflow pages needed for any given row.
+      columns. The &dynamic; format is predicated on the idea that if a
+      portion of a long data value is stored off-page, it is usually
+      most efficient to store all of the value off-page. With &dynamic;
+      format, shorter columns are likely to remain in the B-tree node,
+      minimizing the number of overflow pages needed for any given row.
     </para>
+
   </section>
 
   <section id="innodb-row-format-specification">
+
     <title>Specifying a Table&capos;s Row Format</title>
 
     <indexterm>

@@ -148,16 +151,15 @@
     </indexterm>
 
     <para>
-      The row format used for a table is specified with the
-      &row_format; clause of the
-      &create_table; and &alter_table;
-      commands. Note that &compressed; format implies
-      &dynamic; format. See
+      The row format used for a table is specified with the &row_format;
+      clause of the &create_table; and &alter_table; commands. Note that
+      &compressed; format implies &dynamic; format. See
       <xref linkend="innodb-compression-usage"/> for more details on the
       relationship between this clause and other clauses of these
       commands.
     </para>
+
   </section>
+
 </chapter>
-
 <!-- vim: set sw=2 tw=72: -->


Modified: trunk/innodb-plugin-1.0/innodb-upgrading.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-upgrading.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/innodb-plugin-1.0/innodb-upgrading.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 129, Lines Deleted: 85; 12003 bytes

@@ -6,36 +6,47 @@
   %innodb.entities;
 ]>
 <chapter id="innodb-upgrading">
+
   <title>Upgrading the &innodb_plugin;</title>
 
-  <para>Thanks to the pluggable storage engine architecture of
-  &mysql;, upgrading the &innodb_plugin; should be a simple matter of
-  shutting down &mysql;, replacing a platform-specific executable
-  file, and restarting the server.  If you wish to upgrade and use
-  your existing database, <emphasis role="strong">it is essential to
-  perform a <quote>slow</quote> shutdown</emphasis>, or the new plugin
-  may fail when merging buffered inserts or purging deleted records.
-  If your database does not contain any compressed tables, you should
-  be able to use your database with the newest &innodb_plugin; without
-  problems after a slow shutdown.</para>
+  <para>
+    Thanks to the pluggable storage engine architecture of &mysql;,
+    upgrading the &innodb_plugin; should be a simple matter of shutting
+    down &mysql;, replacing a platform-specific executable file, and
+    restarting the server. If you wish to upgrade and use your existing
+    database, <emphasis role="strong">it is essential to perform a
+    <quote>slow</quote> shutdown</emphasis>, or the new plugin may fail
+    when merging buffered inserts or purging deleted records. If your
+    database does not contain any compressed tables, you should be able
+    to use your database with the newest &innodb_plugin; without
+    problems after a slow shutdown.
+  </para>
 
-  <para>However, if your database contains compressed tables, it may
-  not be compatible with &innodb_plugin; &plugin_version;.  Because of an
-  incompatible change introduced in &innodb_plugin; version 1.0.2,
-  some compressed tables may need to be rebuilt, as noted in <xref
-  linkend="innodb-upgrading-conversion"/>.  Please follow these steps
-  carefully.</para>
+  <para>
+    However, if your database contains compressed tables, it may not be
+    compatible with &innodb_plugin; &plugin_version;. Because of an
+    incompatible change introduced in &innodb_plugin; version 1.0.2,
+    some compressed tables may need to be rebuilt, as noted in
+    <xref
+  linkend="innodb-upgrading-conversion"/>. Please follow these
+    steps carefully.
+  </para>
 
-  <para>You may, of course, rebuild your database using
-  <literal>mysqldump</literal> or other methods.  This may be a
-  preferable approach if your database is small or there are many
-  referential constrains among tables.</para>
+  <para>
+    You may, of course, rebuild your database using
+    <literal>mysqldump</literal> or other methods. This may be a
+    preferable approach if your database is small or there are many
+    referential constrains among tables.
+  </para>
 
-  <para>Note that once you have accessed your database with
-  &innodb_plugin; &plugin_version;, you should not try to use it with 
-  the Plugin prior to 1.0.2.</para>
+  <para>
+    Note that once you have accessed your database with &innodb_plugin;
+    &plugin_version;, you should not try to use it with the Plugin prior
+    to 1.0.2.
+  </para>
 
   <section id="innodb-upgrading-dynamic">
+
     <title>Upgrading the Dynamic &innodb_plugin;</title>
 
     <indexterm>

@@ -43,41 +54,53 @@
       <secondary>dynamic plugin</secondary>
     </indexterm>
 
-    <para>Before shutting down the &mysql; server containing the
-    &innodb_plugin;, you must <emphasis role="strong">enable
-    <quote>slow</quote> shutdown</emphasis>:
+    <para>
+      Before shutting down the &mysql; server containing the
+      &innodb_plugin;, you must <emphasis role="strong">enable
+      <quote>slow</quote> shutdown</emphasis>:
 
-    <programlisting>SET GLOBAL innodb_fast_shutdown=0;</programlisting>
+<programlisting>SET GLOBAL innodb_fast_shutdown=0;</programlisting>
 
-    For the details of the shutdown procedure, see the MySQL manual
-    on <ulink
+      For the details of the shutdown procedure, see the MySQL manual on
+      <ulink
     url="http://dev.mysql.com/doc/refman/5.1/en/server-shutdown.html"
-    >The Shutdown Process</ulink>.</para>
+    >The
+      Shutdown Process</ulink>.
+    </para>
 
-    <para>In the directory where the &mysql; server looks for
-    plugins, rename the executable file of the old &innodb_plugin;
-    (<literal>ha_innodb_plugin.so</literal> or
-    <literal>ha_innodb_plugin.dll</literal>), so that you can restore it
-    later if needed.  You may remove the file later.  The plugin
-    directory is specified by the system variable
-    <literal>plugin_dir</literal>.  The default location is usually
-    the <literal>lib/plugin</literal> subdirectory of the directory
-    specified by <literal>basedir</literal>.</para>
+    <para>
+      In the directory where the &mysql; server looks for plugins,
+      rename the executable file of the old &innodb_plugin;
+      (<literal>ha_innodb_plugin.so</literal> or
+      <literal>ha_innodb_plugin.dll</literal>), so that you can restore
+      it later if needed. You may remove the file later. The plugin
+      directory is specified by the system variable
+      <literal>plugin_dir</literal>. The default location is usually the
+      <literal>lib/plugin</literal> subdirectory of the directory
+      specified by <literal>basedir</literal>.
+    </para>
 
-    <para>Download a suitable package for your server platform,
-    operating system and &mysql; version.  Extract the contents of
-    the archive using <literal>tar</literal> or a similar tool for
-    Linux and Unix, or Windows Explorer or WinZip or similar utility
-    for Windows.  Copy the file <literal>ha_innodb_plugin.so</literal> or
-    <literal>ha_innodb_plugin.dll</literal> to the directory where the
-    &mysql; server looks for plugins.</para>
+    <para>
+      Download a suitable package for your server platform, operating
+      system and &mysql; version. Extract the contents of the archive
+      using <literal>tar</literal> or a similar tool for Linux and Unix,
+      or Windows Explorer or WinZip or similar utility for Windows. Copy
+      the file <literal>ha_innodb_plugin.so</literal> or
+      <literal>ha_innodb_plugin.dll</literal> to the directory where the
+      &mysql; server looks for plugins.
+    </para>
 
-    <para>Start the &mysql; server.  Follow the procedure in <xref
+    <para>
+      Start the &mysql; server. Follow the procedure in
+      <xref
     linkend="innodb-upgrading-conversion"/> to convert any
-    compressed tables if needed.</para>
+      compressed tables if needed.
+    </para>
+
   </section>
 
   <section id="innodb-upgrading-static">
+
     <title>Upgrading a Statically Built &innodb_plugin;</title>
 
     <indexterm>

@@ -85,31 +108,43 @@
       <secondary>static plugin</secondary>
     </indexterm>
 
-    <para>As with a dynamically installed &innodb_plugin;, you must
-    perform a <quote>slow</quote> shutdown of the MySQL server.
-    If you have built &mysql; from source code and replaced
-    the &builtin; with the &innodb_plugin; in the source tree as discussed
-    in <xref linkend="innodb-plugin-installation-source"/>, you will
-    have a special version of the <literal>mysqld</literal>
-    executable that contains the &innodb_plugin;.</para>
+    <para>
+      As with a dynamically installed &innodb_plugin;, you must perform
+      a <quote>slow</quote> shutdown of the MySQL server. If you have
+      built &mysql; from source code and replaced the &builtin; with the
+      &innodb_plugin; in the source tree as discussed in
+      <xref linkend="innodb-plugin-installation-source"/>, you will have
+      a special version of the <literal>mysqld</literal> executable that
+      contains the &innodb_plugin;.
+    </para>
 
-    <para>If you intend to upgrade to a dynamically linked
-    &innodb_plugin;, you can follow the advice of <xref
-    linkend="innodb-downgrading-procedure-static"/> and <xref
-    linkend="innodb-plugin-installation-dynamic"/>.</para>
+    <para>
+      If you intend to upgrade to a dynamically linked &innodb_plugin;,
+      you can follow the advice of
+      <xref
+    linkend="innodb-downgrading-procedure-static"/> and
+      <xref
+    linkend="innodb-plugin-installation-dynamic"/>.
+    </para>
 
-    <para>If you intend to upgrade a statically built
-    &innodb_plugin; to another statically built plugin, you will
-    have to rebuild the <literal>mysqld</literal> executable, shut
-    down the server, and replace the <literal>mysqld</literal>
-    executable before starting the server.</para>
+    <para>
+      If you intend to upgrade a statically built &innodb_plugin; to
+      another statically built plugin, you will have to rebuild the
+      <literal>mysqld</literal> executable, shut down the server, and
+      replace the <literal>mysqld</literal> executable before starting
+      the server.
+    </para>
 
-    <para>Either way, please be sure to follow the instructions of
-    <xref linkend="innodb-upgrading-conversion"/> if any
-    compressed tables were created.</para>
+    <para>
+      Either way, please be sure to follow the instructions of
+      <xref linkend="innodb-upgrading-conversion"/> if any compressed
+      tables were created.
+    </para>
+
   </section>
 
   <section id="innodb-upgrading-conversion">
+
     <title>Converting Compressed Tables Created Before Version 1.0.2</title>
 
     <indexterm>

@@ -117,25 +152,34 @@
       <secondary>converting compressed tables</secondary>
     </indexterm>
 
-    <para>The &innodb_plugin; version 1.0.2 introduces an <emphasis
-    role="strong">incompatible change to the format of compressed
-    tables</emphasis>. This means that some compressed tables that
-    were created with an earlier version of the &innodb_plugin; may
-    need to be rebuilt with a bigger &key_block_size; before they can
-    be used.</para>
+    <para>
+      The &innodb_plugin; version 1.0.2 introduces an
+      <emphasis
+    role="strong">incompatible change to the format of
+      compressed tables</emphasis>. This means that some compressed
+      tables that were created with an earlier version of the
+      &innodb_plugin; may need to be rebuilt with a bigger
+      &key_block_size; before they can be used.
+    </para>
 
-    <para>If you must keep your existing database when you upgrade to
-    &innodb_plugin; 1.0.2 or newer, you will need to perform a
-    <quote>slow</quote> shutdown of MySQL running the previous version
-    of the &innodb_plugin;.  Following such a shutdown, and using the
-    newer release of the &innodb_plugin;, you will need to determine
-    which compressed tables need conversion and then follow a
-    procedure to upgrade these tables.  Because most users will not
-    have tables where this process is required, this manual does not
-    detail the procedures required.  If you have created compressed
-    tables with the &innodb_plugin; prior to release 1.0.2, you may
-    want to review the <ulink
+    <para>
+      If you must keep your existing database when you upgrade to
+      &innodb_plugin; 1.0.2 or newer, you will need to perform a
+      <quote>slow</quote> shutdown of MySQL running the previous version
+      of the &innodb_plugin;. Following such a shutdown, and using the
+      newer release of the &innodb_plugin;, you will need to determine
+      which compressed tables need conversion and then follow a
+      procedure to upgrade these tables. Because most users will not
+      have tables where this process is required, this manual does not
+      detail the procedures required. If you have created compressed
+      tables with the &innodb_plugin; prior to release 1.0.2, you may
+      want to review the
+      <ulink
     url="http://www.innodb.com/wp/support/tips/fix-compressed/"
-    >relevant information on the InnoDB website</ulink>.</para>
+    >relevant
+      information on the InnoDB website</ulink>.
+    </para>
+
   </section>
+
 </chapter>


Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3838 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1529,22 +1513,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -8462,22 +8430,6 @@
       are not yet supported.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13184,20 +13136,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -14089,22 +14027,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-4.1/backup.xml
===================================================================
--- trunk/refman-4.1/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -692,18 +692,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -897,18 +885,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -2166,18 +2142,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-4.1/dba-log-files.xml
===================================================================
--- trunk/refman-4.1/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1931 bytes

@@ -96,18 +96,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-log">
 
     <title>The Error Log</title>

@@ -487,19 +475,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -851,20 +826,6 @@
       <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL 4.0, slow administrative statements such as
       <literal role="stmt">OPTIMIZE TABLE</literal>,


Modified: trunk/refman-4.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-4.1/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 7, Lines Added: 0, Lines Deleted: 91; 4123 bytes

@@ -122,18 +122,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -3338,19 +3326,6 @@
           This variable was added in MySQL 3.23.29. See
           <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -5641,21 +5616,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -5757,19 +5717,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -8526,18 +8473,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -9279,20 +9214,6 @@
 
       <para condition="dynamic:optvar:dynamicvarsummary" role="4.1:mysqld:dynamicvar:Dynamic Variable Summary"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -9341,18 +9262,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. The
       <literal>Com_<replaceable>xxx</replaceable></literal> statement


Modified: trunk/refman-4.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-4.1/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 58; 2943 bytes

@@ -625,23 +625,6 @@
           privilege for the database. <literal role="priv">SHOW
           DATABASES</literal> was added in MySQL 4.0.2.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -768,20 +751,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1592,20 +1561,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2674,19 +2629,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-4.1/dba-security-core.xml
===================================================================
--- trunk/refman-4.1/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1411 bytes

@@ -1386,18 +1386,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -2027,20 +2015,6 @@
 <programlisting>
 ERROR 1148: The used command is not allowed with this MySQL version
 </programlisting>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Security advisors notify subscribers to the MySQL Enterprise
-            Monitor whenever a server is started with the
-            <option role="mysqld">--local-infile</option> option
-            enabled. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/errors-problems.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 102; 4549 bytes

@@ -16,18 +16,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -1374,20 +1362,6 @@
           variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -2000,20 +1974,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3106,18 +3066,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3929,19 +3877,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -4029,19 +3964,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4937,18 +4859,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5440,18 +5350,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 683 bytes

@@ -154,18 +154,6 @@
         replication threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/installing.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 25; 1385 bytes

@@ -3521,18 +3521,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         On Windows, the MySQL installer places the data directory
         directly under the directory where you install MySQL. If you

@@ -10650,19 +10638,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on start-up options appropriate to your
-            circumstances, subscribe to The MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Storage engines will use default option values if you specify
           none, but it is recommended that you review the available


Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/language-structure.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 859 bytes

@@ -1249,19 +1249,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database and table names are not case sensitive on


Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 16, Lines Added: 0, Lines Deleted: 203; 9063 bytes

@@ -70,18 +70,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -229,18 +217,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, you should define an easily extendable interface

@@ -1881,18 +1857,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -1963,18 +1927,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -4192,18 +4144,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -4600,19 +4540,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -4914,19 +4841,6 @@
             deleted a lot of rows from it. See
             <xref linkend="concurrent-inserts"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For optimization tips geared to your specific
-              circumstances, subscribe to the MySQL Enterprise Monitor.
-              For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -5863,20 +5777,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-index-statistics">

@@ -6241,19 +6141,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -6572,20 +6459,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -7441,18 +7314,6 @@
           default size is 0, so the query cache is disabled by default.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -7653,19 +7514,6 @@
           present as of MySQL 4.1.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -7913,18 +7761,6 @@
         <literal>MyISAM</literal> setup is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -8470,19 +8306,6 @@
             <literal>BDB</literal> tables. See <xref linkend="innodb"/>,
             and <xref linkend="bdb-storage-engine"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Lock contention can seriously degrade performance. The
-              MySQL Enterprise Monitor provides expert advice on
-              avoiding this problem. To subscribe, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
       </itemizedlist>

@@ -9013,20 +8836,6 @@
         more tables than this to execute queries.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Performance may suffer if
-          <literal role="sysvar">table_cache</literal> is set too low.
-          For expert advice on the optimum value for this variable,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL closes an unused table and removes it from the table cache
         under the following circumstances:

@@ -9866,18 +9675,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="connection-threads">


Modified: trunk/refman-4.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3035 bytes

@@ -451,18 +451,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1745,18 +1733,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6675,22 +6651,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -6989,18 +6949,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -7066,19 +7014,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>


Modified: trunk/refman-4.1/programs-client-core.xml
===================================================================
--- trunk/refman-4.1/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4737 bytes

@@ -599,19 +599,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1175,18 +1162,6 @@
             use the newer password format. This option was added in
             MySQL 4.1.1.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3234,18 +3209,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3332,19 +3295,6 @@
             format. This command was added in MySQL 4.1.0. (See
             <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3498,18 +3448,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4606,18 +4544,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -7451,22 +7377,6 @@
         <xref linkend="backup-strategy-example"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -7916,19 +7826,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 775 bytes

@@ -325,18 +325,6 @@
       TO</literal> instead.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice regarding slave startup options subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       Because the server gives an existing
       <filename>master.info</filename> file precedence over the startup


Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 50; 2425 bytes

@@ -41,18 +41,6 @@
     problems.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that
-      provide immediate feedback about replication-related problems. For
-      more information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     For a description of the syntax of replication-related SQL
     statements, see <xref linkend="sql-syntax-replication"/>.

@@ -267,18 +255,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates

@@ -881,20 +857,6 @@
           recommended), you need not grant any additional privileges.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor are quickly
-            notified if there is a replication master and no account
-            with the <literal role="priv">REPLICATION SLAVE</literal>
-            privilege. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Suppose that your domain is <literal>mydomain.com</literal>
           and that you want to create an account with a user name of

@@ -4667,18 +4629,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 37; 1671 bytes

@@ -1293,18 +1293,6 @@
       </para>
     </caution>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="4.1:mysqld:section-innodb"/>
 
     <para>

@@ -7870,18 +7858,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For optimization recommendations geared to your specific
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-monitors">

@@ -9163,19 +9139,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-4.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 27; 1423 bytes

@@ -85,20 +85,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-table">

@@ -1380,19 +1366,6 @@
       <literal>NULL</literal>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only


Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 7, Lines Added: 0, Lines Deleted: 90; 4050 bytes

@@ -285,18 +285,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -842,18 +830,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1599,18 +1575,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -3016,18 +2980,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -4435,21 +4387,6 @@
         STATUS</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -5332,19 +5269,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -6384,20 +6308,6 @@
 
       <remark role="help-description-end"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-table-status">


Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-4.1/storage-engines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1339 bytes

@@ -944,19 +944,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive notification
-          if the <option role="mysqld">--myisam-recover</option> option
-          has not been set. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         If the recovery wouldn't be able to recover all rows from
         previously completed statements and you didn't specify

@@ -1541,19 +1528,6 @@
           Internals: Porting</ulink>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Find out about problems before they occur. Subscribe to the
-            MySQL Enterprise Monitor for expert advice about the state
-            of your servers. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="myisam-table-close">


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3860 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1568,22 +1552,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -8674,22 +8642,6 @@
       are not supported in MySQL &current-series;.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13339,20 +13291,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -14347,22 +14285,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-5.0/backup.xml
===================================================================
--- trunk/refman-5.0/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -692,18 +692,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -891,18 +879,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -2219,18 +2195,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-5.0/dba-log-files.xml
===================================================================
--- trunk/refman-5.0/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1953 bytes

@@ -87,18 +87,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-log">
 
     <title>The Error Log</title>

@@ -372,19 +360,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -802,20 +777,6 @@
       option is specified. See <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series;, the
       <option role="mysqld">--log-slow-admin-statements</option> server


Modified: trunk/refman-5.0/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.0/dba-multiple-servers.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/dba-multiple-servers.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 720 bytes

@@ -917,19 +917,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find additional information
-        on running multiple MySQL servers on one machine in the MySQL
-        Enterprise Knowledge Base article found at
-        <ulink url="https://kb.mysql.com/view.php?id=4926"/>.
-      </para>
-
-    </formalpara>
-
   </section>
 
 </section>


Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 7, Lines Added: 0, Lines Deleted: 91; 4151 bytes

@@ -121,18 +121,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -3554,19 +3542,6 @@
           variables can be useful for tuning the size of this variable.
           See <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -6348,21 +6323,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -6467,19 +6427,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -9769,18 +9716,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -10504,20 +10439,6 @@
 
       <para condition="dynamic:optvar:dynamicvarsummary" role="5.0:mysqld:dynamicvar:Dynamic Variable Summary"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -10593,18 +10514,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. Variables with
       no version indicated were already present prior to MySQL


Modified: trunk/refman-5.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.0/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 73; 3648 bytes

@@ -431,21 +431,6 @@
           <literal role="priv">INSERT</literal> and
           <literal role="priv">CREATE</literal> privileges.)
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            In some circumstances, the
-            <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary&mdash;on slaves where there are no nonreplicated
-            tables, for instance. The MySQL Enterprise Monitor notifies
-            subscribers when accounts have inappropriate privileges. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -702,23 +687,6 @@
           Note that <emphasis>any</emphasis> global privilege is a
           privilege for the database.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -858,20 +826,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1802,20 +1756,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2886,19 +2826,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.0/dba-security-core.xml
===================================================================
--- trunk/refman-5.0/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 64; 3070 bytes

@@ -135,20 +135,6 @@
           is easy to remember and type, but difficult to guess for
           someone who does not know the sentence.
         </para>
-
-        <formalpara role="mnmas-kb">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            MySQL Enterprise subscribers can find an example of a
-            function that checks password security in the Knowledge Base
-            article, <ulink url="https://kb.mysql.com/view.php?id=5358">
-            Checking Password Complexity</ulink>. To subscribe to MySQL
-            Enterprise see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1074,19 +1060,6 @@
         <option role="mysqld">--old-passwords</option>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor are automatically
-          alerted whenever a server is running with the
-          <option role="mysqld">--old-passwords</option> option. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following scenarios are possible for running a 4.1 or later
         server:

@@ -1375,18 +1348,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -1688,18 +1649,6 @@
           server must support older client programs. See
           <xref linkend="password-hashing"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor offers advice on the security
-            implications of using this option. For subscription
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2065,19 +2014,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Security advisors notify subscribers to the MySQL Enterprise
-        Monitor whenever a server is started with the
-        <option role="mysqld">--local-infile</option> option enabled.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="changing-mysql-user">


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/errors-problems.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 116; 5191 bytes

@@ -16,18 +16,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -305,20 +293,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        server error messages at,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=663">
-        Error Messages</ulink>. For information about subscribing to
-        MySQL Enterprise see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       Because updates are frequent, it is possible that those files will
       contain additional error information not listed here.

@@ -1406,20 +1380,6 @@
           variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -2000,20 +1960,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3054,18 +3000,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3873,19 +3807,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -3973,19 +3894,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4912,18 +4820,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5398,18 +5294,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 683 bytes

@@ -154,18 +154,6 @@
         replication threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/installing-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 25; 1400 bytes

@@ -2563,18 +2563,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         On Windows, the MySQL installer places the data directory
         directly under the directory where you install MySQL. If you

@@ -10466,19 +10454,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on start-up options appropriate to your
-            circumstances, subscribe to The MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Storage engines will use default option values if you specify
           none, but it is recommended that you review the available


Modified: trunk/refman-5.0/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.0/installing-updowngrade.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/installing-updowngrade.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 1107 bytes

@@ -416,22 +416,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Several visible behaviors have changed between MySQL
         &previous-series; and MySQL &current-series; to make MySQL more


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/introduction.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1884 bytes

@@ -499,18 +499,6 @@
           <emphasis role="bold">XA Transactions</emphasis>: See
           <xref linkend="xa"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For assistance in maximizing your usage of the many new
-            features of MySQL, subscribe to MySQL Enterprise. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1761,18 +1749,6 @@
           choice can be made on a per-table basis.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on choosing and tuning storage engines,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           As noted, the tradeoff for transactional versus
           nontransactional storage engines lies mostly in performance.

@@ -2459,18 +2435,6 @@
         requirements. See <xref linkend="server-sql-mode"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          To be alerted when there is no form of server-enforced data
-          integrity, subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following sections describe how MySQL Server handles
         different types of constraints.


Modified: trunk/refman-5.0/language-structure-core.xml
===================================================================
--- trunk/refman-5.0/language-structure-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/language-structure-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 874 bytes

@@ -1355,19 +1355,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database and table names are not case sensitive on


Modified: trunk/refman-5.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-management.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/mysql-cluster-management.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 999 bytes

@@ -1560,22 +1560,6 @@
         inconsistent while the restore is in progress.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          Cluster backup in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5803"> How Do I
-          Backup my Cluster Database</ulink>. Access to the MySQL
-          Knowledge Base collection of articles is one of the advantages
-          of subscribing to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>


Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 17, Lines Added: 0, Lines Deleted: 220; 9907 bytes

@@ -70,18 +70,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -229,18 +217,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, you should define an easily extendable interface

@@ -1944,18 +1920,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -2026,18 +1990,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -6520,18 +6472,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -6927,19 +6867,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -7245,19 +7172,6 @@
             concurrent inserts), even in tables that have deleted rows.
             See <xref linkend="concurrent-inserts"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For optimization tips geared to your specific
-              circumstances, subscribe to the MySQL Enterprise Monitor.
-              For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8285,20 +8199,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-index-statistics">

@@ -8645,19 +8545,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -8954,20 +8841,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -9841,18 +9714,6 @@
           default size is 0, so the query cache is disabled by default.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -10048,19 +9909,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -10307,18 +10155,6 @@
         <literal>MyISAM</literal> setup is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -10864,19 +10700,6 @@
             <literal>BDB</literal> tables. See <xref linkend="innodb"/>,
             and <xref linkend="bdb-storage-engine"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Lock contention can seriously degrade performance. The
-              MySQL Enterprise Monitor provides expert advice on
-              avoiding this problem. To subscribe, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
       </itemizedlist>

@@ -11452,20 +11275,6 @@
         more tables than this to execute queries.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Performance may suffer if
-          <literal role="sysvar">table_cache</literal> is set too low.
-          For expert advice on the optimum value for this variable,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL closes an unused table and removes it from the table cache
         under the following circumstances:

@@ -12471,18 +12280,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="connection-threads">

@@ -12716,23 +12513,6 @@
             the permissible temporary table size as described in
             <xref linkend="internal-temporary-tables"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Subscribers to the MySQL Enterprise Monitor are alerted
-              when temporary tables exceed
-              <literal role="sysvar">tmp_table_size</literal>. Advisors
-              make recommendations for the optimum value of
-              <literal role="sysvar">tmp_table_size</literal> based on
-              actual table usage. For more information about the MySQL
-              Enterprise Monitor please see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3035 bytes

@@ -573,18 +573,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1854,18 +1842,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6068,19 +6044,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -7006,22 +6969,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8794,18 +8741,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4773 bytes

@@ -659,19 +659,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1228,18 +1215,6 @@
             format. This prevents connections except for servers that
             use the newer password format.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3417,18 +3392,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server status variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3514,19 +3477,6 @@
             stores the password using the old (pre-4.1) password-hashing
             format. (See <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3677,18 +3627,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4785,18 +4723,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8020,22 +7946,6 @@
         <xref linkend="view-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8485,19 +8395,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/replication-configuration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 809 bytes

@@ -1368,18 +1368,6 @@
       status of each slave periodically, daily, or even more frequently.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For regular reports regarding the status of your slaves,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="replication-administration-status">
 
       <title>Checking Replication Status</title>


Modified: trunk/refman-5.0/replication-implementation.xml
===================================================================
--- trunk/refman-5.0/replication-implementation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/replication-implementation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 783 bytes

@@ -157,18 +157,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates


Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/replication-notes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1702 bytes

@@ -519,18 +519,6 @@
         <xref linkend="problems-with-float"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice regarding replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-flush">

@@ -1462,18 +1450,6 @@
         would produce no such error, causing replication to stop.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For instant notification when a slave thread terminates,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-sql-mode">

@@ -3040,18 +3016,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 776 bytes

@@ -608,18 +608,6 @@
       TO</literal> instead.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice regarding slave startup options, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       Because the server gives an existing
       <filename>master.info</filename> file precedence over the startup


Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 836 bytes

@@ -141,18 +141,6 @@
     <xref linkend="replication-implementation"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that give
-      immediate feedback about replication-related problems. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-implementation.xml"/>


Modified: trunk/refman-5.0/se-federated.xml
===================================================================
--- trunk/refman-5.0/se-federated.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/se-federated.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 977 bytes

@@ -66,22 +66,6 @@
 
   </itemizedlist>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find MySQL Knowledge Base
-      articles about the <literal>FEDERATED</literal> storage engine at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=272">
-      FEDERATED Storage Engine</ulink>. Access to the Knowledge Base
-      collection of articles is one of the advantages of subscribing to
-      MySQL Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="federated-description">
 
     <title>Description of the <literal>FEDERATED</literal> Storage Engine</title>


Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 49; 2232 bytes

@@ -264,18 +264,6 @@
       </para>
     </caution>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For advice on settings suitable to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The examples shown here are representative. See
       <xref linkend="innodb-parameters"/> for additional information

@@ -1180,18 +1168,6 @@
       <xref linkend="dynamic-system-variables"/>).
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:section-innodb:InnoDB Option/Variable Reference"/>
 
     <para>

@@ -7855,18 +7831,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For optimization recommendations geared to your specific
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-monitors">

@@ -9144,19 +9108,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-5.0/se-myisam-core.xml
===================================================================
--- trunk/refman-5.0/se-myisam-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/se-myisam-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1225 bytes

@@ -453,19 +453,6 @@
       conditions is true, the following happens:
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise Monitor receive notification if
-        the <option role="mysqld">--myisam-recover</option> option has
-        not been set. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <itemizedlist>
 
       <listitem>

@@ -1084,19 +1071,6 @@
         Internals: Porting</ulink>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Find out about problems before they occur. Subscribe to the
-          MySQL Enterprise Monitor for expert advice about the state of
-          your servers. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-table-close">


Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1877 bytes

@@ -94,20 +94,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-function">

@@ -1640,19 +1626,6 @@
       must be unique within the prefix.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only

@@ -4429,18 +4402,6 @@
       5.0.2.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on creating triggers, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series; <literal role="stmt">CREATE
       TRIGGER</literal> requires the


Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 14; 917 bytes

@@ -6250,20 +6250,6 @@
       is given in <xref linkend="subquery-restrictions"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find a discussion of this
-        topic in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5932"> How do
-        Subqueries Work in MySQL?</ulink> For information about MySQL
-        Enterprise see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="scalar-subqueries">
 
       <title>The Subquery as Scalar Operand</title>


Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 115; 5123 bytes

@@ -34,19 +34,6 @@
       </para>
     </important>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment it is always prudent to examine any
-        changes to users' accounts. The MySQL Enterprise Monitor
-        provides notification whenever users' privileges are altered.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="create-user">
 
       <title><literal role="stmt">CREATE USER</literal> Syntax</title>

@@ -417,18 +404,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -1041,18 +1016,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1843,18 +1806,6 @@
         executing <literal>SELECT CURRENT_USER()</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users without passwords,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -1905,18 +1856,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -3471,18 +3410,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -5188,21 +5115,6 @@
         STATUS</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -6527,19 +6439,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -7927,20 +7826,6 @@
         is listed at <xref linkend="server-status-variables"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Before MySQL 5.0.2, <literal role="stmt">SHOW STATUS</literal>


Modified: trunk/refman-5.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-transactions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/sql-syntax-transactions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1381 bytes

@@ -1822,18 +1822,6 @@
       acts as the Transaction Manager.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on XA Distributed Transaction Support,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To carry out a global transaction, it is necessary to know which
       components are involved, and bring each component to a point when

@@ -2302,20 +2290,6 @@
         <xref linkend="implicit-commit"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information on
-          this subject in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5199"> Can I Undo
-          a Set of SQL Statements?</ulink> To subscribe to MySQL
-          Enterprise see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>


Modified: trunk/refman-5.0/stored-routines.xml
===================================================================
--- trunk/refman-5.0/stored-routines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.0/stored-routines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1307 bytes

@@ -42,18 +42,6 @@
     table exists. See <xref linkend="mysql-upgrade"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      For expert advice on using stored procedures and functions,
-      subscribe to the MySQL Enterprise Monitor. For more information,
-      see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     Stored routines can be particularly useful in certain situations:
   </para>

@@ -259,20 +247,6 @@
       <xref linkend="c-api-multiple-queries"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        stored routines in the MySQL Enterprise Knowledge Base. Access
-        to this collection of articles is one of the advantages of
-        subscribing to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="stored-routines-privileges">


Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3875 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1553,22 +1537,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -8780,22 +8748,6 @@
       information, see <xref linkend="statement-repreparation"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13413,20 +13365,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -14423,22 +14361,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-5.1/backup.xml
===================================================================
--- trunk/refman-5.1/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -701,18 +701,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -900,18 +888,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -2238,18 +2214,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-5.1/dba-log-files.xml
===================================================================
--- trunk/refman-5.1/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 2007 bytes

@@ -100,18 +100,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="log-tables">
 
     <title>Selecting General Query and Slow Query Log Output Destinations</title>

@@ -916,19 +904,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -2471,20 +2446,6 @@
       option is specified. See <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series;, the
       <option role="mysqld">--log-slow-admin-statements</option> server


Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 6, Lines Added: 0, Lines Deleted: 78; 3531 bytes

@@ -123,18 +123,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -7068,21 +7056,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -7187,19 +7160,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -10902,18 +10862,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -11631,20 +11579,6 @@
         <citetitle>Dynamic Variable Summary</citetitle>
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -11707,18 +11641,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. Variables with
       no version indicated were already present prior to MySQL


Modified: trunk/refman-5.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.1/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 73; 3648 bytes

@@ -441,21 +441,6 @@
           <literal role="priv">INSERT</literal> and
           <literal role="priv">CREATE</literal> privileges.)
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            In some circumstances, the
-            <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary&mdash;on slaves where there are no nonreplicated
-            tables, for instance. The MySQL Enterprise Monitor notifies
-            subscribers when accounts have inappropriate privileges. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -726,23 +711,6 @@
           Note that <emphasis>any</emphasis> global privilege is a
           privilege for the database.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -892,20 +860,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1863,20 +1817,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2949,19 +2889,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.1/dba-security-core.xml
===================================================================
--- trunk/refman-5.1/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 64; 3070 bytes

@@ -135,20 +135,6 @@
           is easy to remember and type, but difficult to guess for
           someone who does not know the sentence.
         </para>
-
-        <formalpara role="mnmas-kb">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            MySQL Enterprise subscribers can find an example of a
-            function that checks password security in the Knowledge Base
-            article, <ulink url="https://kb.mysql.com/view.php?id=5358">
-            Checking Password Complexity</ulink>. To subscribe to MySQL
-            Enterprise see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1076,19 +1062,6 @@
         <option role="mysqld">--old-passwords</option>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor are automatically
-          alerted whenever a server is running with the
-          <option role="mysqld">--old-passwords</option> option. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following scenarios are possible for running a 4.1 or later
         server:

@@ -1377,18 +1350,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -1689,18 +1650,6 @@
           server must support older client programs. See
           <xref linkend="password-hashing"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor offers advice on the security
-            implications of using this option. For subscription
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2087,19 +2036,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Security advisors notify subscribers to the MySQL Enterprise
-        Monitor whenever a server is started with the
-        <option role="mysqld">--local-infile</option> option enabled.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="changing-mysql-user">


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/errors-problems-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 102; 4569 bytes

@@ -18,18 +18,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -1396,20 +1384,6 @@
           this variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -1990,20 +1964,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3043,18 +3003,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3862,19 +3810,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -3962,19 +3897,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4893,18 +4815,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5284,18 +5194,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 694 bytes

@@ -162,18 +162,6 @@
         replication, and event threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-5.1/installing-postinstall.xml
===================================================================
--- trunk/refman-5.1/installing-postinstall.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/installing-postinstall.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 816 bytes

@@ -1300,18 +1300,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on start-up options appropriate to your
-          circumstances, subscribe to The MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Storage engines will use default option values if you specify
         none, but it is recommended that you review the available


Modified: trunk/refman-5.1/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.1/installing-updowngrade.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/installing-updowngrade.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 1105 bytes

@@ -416,22 +416,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading


Modified: trunk/refman-5.1/installing-windows.xml
===================================================================
--- trunk/refman-5.1/installing-windows.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/installing-windows.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 851 bytes

@@ -2791,18 +2791,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         In MySQL 5.1.23 and earlier, the MySQL installer places the data
         directory directly under the directory where you install MySQL.


Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/introduction.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 24; 1329 bytes

@@ -1807,18 +1807,6 @@
           situations.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on choosing and tuning storage engines,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the nontransactional

@@ -2492,18 +2480,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          To be alerted when there is no form of server-enforced data
-          integrity, subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following sections describe how MySQL Server handles
         different types of constraints.


Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/language-structure-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -1384,19 +1384,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database, table, and trigger names are not case


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 999 bytes

@@ -1877,22 +1877,6 @@
         inconsistent while the restore is in progress.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          Cluster backup in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5803"> How Do I
-          Backup my Cluster Database</ulink>. Access to the MySQL
-          Knowledge Base collection of articles is one of the advantages
-          of subscribing to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 17, Lines Added: 0, Lines Deleted: 220; 9885 bytes

@@ -70,18 +70,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -229,18 +217,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, you should define an easily extendable interface

@@ -2104,18 +2080,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -2186,18 +2150,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -6655,18 +6607,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -7062,19 +7002,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -8107,19 +8034,6 @@
             concurrent inserts), even in tables that have deleted rows.
             See <xref linkend="concurrent-inserts"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For optimization tips geared to your specific
-              circumstances, subscribe to the MySQL Enterprise Monitor.
-              For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -9335,20 +9249,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-index-statistics">

@@ -9693,19 +9593,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -10002,20 +9889,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -11119,18 +10992,6 @@
           default size is 0, so the query cache is disabled by default.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -11337,19 +11198,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -11586,18 +11434,6 @@
         <literal>MyISAM</literal> setup is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -12138,19 +11974,6 @@
             your tables to <literal>InnoDB</literal>. See
             <xref linkend="innodb"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Lock contention can seriously degrade performance. The
-              MySQL Enterprise Monitor provides expert advice on
-              avoiding this problem. To subscribe, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
       </itemizedlist>

@@ -12735,20 +12558,6 @@
         more tables than this to execute queries.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Performance may suffer if
-          <literal role="sysvar">table_open_cache</literal> is set too
-          low. For expert advice on the optimum value for this variable,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL closes an unused table and removes it from the table cache
         under the following circumstances:

@@ -13787,18 +13596,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="connection-threads">

@@ -14033,23 +13830,6 @@
             the permissible temporary table size as described in
             <xref linkend="internal-temporary-tables"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Subscribers to the MySQL Enterprise Monitor are alerted
-              when temporary tables exceed
-              <literal role="sysvar">tmp_table_size</literal>. Advisors
-              make recommendations for the optimum value of
-              <literal role="sysvar">tmp_table_size</literal> based on
-              actual table usage. For more information about the MySQL
-              Enterprise Monitor please see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3075 bytes

@@ -578,18 +578,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1848,18 +1836,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6059,19 +6035,6 @@
         </para>
       </warning>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
     <refsection id="mysqlbinlog-hexdump">

@@ -7656,22 +7619,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -10094,18 +10041,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4773 bytes

@@ -709,19 +709,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1278,18 +1265,6 @@
             format. This prevents connections except for servers that
             use the newer password format.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3470,18 +3445,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server status variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3567,19 +3530,6 @@
             stores the password using the old (pre-4.1) password-hashing
             format. (See <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3730,18 +3680,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4903,18 +4841,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8358,22 +8284,6 @@
         <xref linkend="view-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8871,19 +8781,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/replication-configuration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 809 bytes

@@ -2600,18 +2600,6 @@
       status of each slave periodically, daily, or even more frequently.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For regular reports regarding the status of your slaves,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="replication-administration-status">
 
       <title>Checking Replication Status</title>


Modified: trunk/refman-5.1/replication-implementation.xml
===================================================================
--- trunk/refman-5.1/replication-implementation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/replication-implementation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 783 bytes

@@ -157,18 +157,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates


Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/replication-notes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1629 bytes

@@ -2993,18 +2993,6 @@
         would produce no such error, causing replication to stop.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For instant notification when a slave thread terminates,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-sql-mode">

@@ -3999,18 +3987,6 @@
 
     <title>Replication FAQ</title>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on replication, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <qandaset>
 
       <qandaentry>

@@ -4762,18 +4738,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -3215,19 +3215,6 @@
           variables can be useful for tuning the size of this variable.
           See <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal>,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 839 bytes

@@ -152,18 +152,6 @@
     <xref linkend="replication-implementation"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that
-      provide immediate feedback about replication-related problems. For
-      more information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-implementation.xml"/>


Modified: trunk/refman-5.1/se-federated.xml
===================================================================
--- trunk/refman-5.1/se-federated.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/se-federated.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 989 bytes

@@ -44,22 +44,6 @@
     MySQL source distribution.
   </para>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find MySQL Knowledge Base
-      articles about the <literal>FEDERATED</literal> storage engine at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=272">
-      FEDERATED Storage Engine</ulink>. Access to the Knowledge Base
-      collection of articles is one of the advantages of subscribing to
-      MySQL Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="federated-description">
 
     <title><literal>FEDERATED</literal> Storage Engine Overview</title>


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 49; 2275 bytes

@@ -472,18 +472,6 @@
       </para>
     </caution>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For advice on settings suitable to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The examples shown here are representative. See
       <xref linkend="innodb-parameters"/> for additional information

@@ -1381,18 +1369,6 @@
       <xref linkend="dynamic-system-variables"/>).
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="5.1:mysqld:section-innodb">
       <citetitle><literal>InnoDB</literal> Option/Variable
       Reference</citetitle>

@@ -9233,18 +9209,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For optimization recommendations geared to your specific
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-monitors">

@@ -10543,19 +10507,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-5.1/se-myisam-core.xml
===================================================================
--- trunk/refman-5.1/se-myisam-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/se-myisam-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1284 bytes

@@ -487,19 +487,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise Monitor receive notification if
-        the <option role="mysqld">--myisam-recover</option> option has
-        not been set. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       If the recovery wouldn't be able to recover all rows from
       previously completed statements and you didn't specify

@@ -1079,19 +1066,6 @@
         Internals: Porting</ulink>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Find out about problems before they occur. Subscribe to the
-          MySQL Enterprise Monitor for expert advice about the state of
-          your servers. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-table-close">


Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1952 bytes

@@ -164,20 +164,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-event">

@@ -3951,19 +3937,6 @@
       must be unique within the prefix.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only

@@ -8000,18 +7973,6 @@
       <literal>TEMPORARY</literal> table or a view.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on creating triggers, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal role="stmt">CREATE TRIGGER</literal> requires the
       <literal role="priv">TRIGGER</literal> privilege for the table


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 115; 5074 bytes

@@ -34,19 +34,6 @@
       </para>
     </important>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment it is always prudent to examine any
-        changes to users' accounts. The MySQL Enterprise Monitor
-        provides notification whenever users' privileges are altered.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="create-user">
 
       <title><literal role="stmt">CREATE USER</literal> Syntax</title>

@@ -356,18 +343,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -992,18 +967,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1784,18 +1747,6 @@
         executing <literal>SELECT CURRENT_USER()</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users without passwords,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -1845,18 +1796,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -3966,18 +3905,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -6189,21 +6116,6 @@
         </para>
       </note>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -7760,19 +7672,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -9313,20 +9212,6 @@
         <literal role="statvar">Created_tmp_tables</literal> value.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
     </section>


Modified: trunk/refman-5.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-transactions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/sql-syntax-transactions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 820 bytes

@@ -1909,18 +1909,6 @@
       acts as the Transaction Manager.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on XA Distributed Transaction Support,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To carry out a global transaction, it is necessary to know which
       components are involved, and bring each component to a point when


Modified: trunk/refman-5.1/stored-routines.xml
===================================================================
--- trunk/refman-5.1/stored-routines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.1/stored-routines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1307 bytes

@@ -42,18 +42,6 @@
     table exists. See <xref linkend="mysql-upgrade"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      For expert advice on using stored procedures and functions,
-      subscribe to the MySQL Enterprise Monitor. For more information,
-      see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     Stored routines can be particularly useful in certain situations:
   </para>

@@ -250,20 +238,6 @@
       <xref linkend="c-api-multiple-queries"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        stored routines in the MySQL Enterprise Knowledge Base. Access
-        to this collection of articles is one of the advantages of
-        subscribing to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="stored-routines-privileges">


Modified: trunk/refman-5.5/apis-c.xml
===================================================================
--- trunk/refman-5.5/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3858 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1565,22 +1549,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -8771,22 +8739,6 @@
       <xref linkend="statement-repreparation"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13560,20 +13512,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -14942,22 +14880,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-5.5/backup.xml
===================================================================
--- trunk/refman-5.5/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -709,18 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -908,18 +896,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -2246,18 +2222,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-5.5/dba-log-files.xml
===================================================================
--- trunk/refman-5.5/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 2007 bytes

@@ -100,18 +100,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="log-tables">
 
     <title>Selecting General Query and Slow Query Log Output Destinations</title>

@@ -797,19 +785,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -2541,20 +2516,6 @@
       option is specified. See <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series;, the
       <option role="mysqld">--log-slow-admin-statements</option> server


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 6, Lines Added: 0, Lines Deleted: 78; 3531 bytes

@@ -123,18 +123,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -7033,21 +7021,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -7152,19 +7125,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -10940,18 +10900,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -11669,20 +11617,6 @@
         <citetitle>Dynamic Variable Summary</citetitle>
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -11745,18 +11679,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. Variables with
       no version indicated were already present prior to MySQL


Modified: trunk/refman-5.5/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.5/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 73; 3648 bytes

@@ -446,21 +446,6 @@
           <literal role="priv">INSERT</literal> and
           <literal role="priv">CREATE</literal> privileges.)
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            In some circumstances, the
-            <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary&mdash;on slaves where there are no nonreplicated
-            tables, for instance. The MySQL Enterprise Monitor notifies
-            subscribers when accounts have inappropriate privileges. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -734,23 +719,6 @@
           Note that <emphasis>any</emphasis> global privilege is a
           privilege for the database.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -897,20 +865,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1868,20 +1822,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2954,19 +2894,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.5/dba-security-core.xml
===================================================================
--- trunk/refman-5.5/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 64; 3070 bytes

@@ -136,20 +136,6 @@
           is easy to remember and type, but difficult to guess for
           someone who does not know the sentence.
         </para>
-
-        <formalpara role="mnmas-kb">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            MySQL Enterprise subscribers can find an example of a
-            function that checks password security in the Knowledge Base
-            article, <ulink url="https://kb.mysql.com/view.php?id=5358">
-            Checking Password Complexity</ulink>. To subscribe to MySQL
-            Enterprise see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1077,19 +1063,6 @@
         <option role="mysqld">--old-passwords</option>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor are automatically
-          alerted whenever a server is running with the
-          <option role="mysqld">--old-passwords</option> option. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following scenarios are possible for running a 4.1 or later
         server:

@@ -1378,18 +1351,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -1690,18 +1651,6 @@
           server must support older client programs. See
           <xref linkend="password-hashing"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor offers advice on the security
-            implications of using this option. For subscription
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2063,19 +2012,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Security advisors notify subscribers to the MySQL Enterprise
-        Monitor whenever a server is started with the
-        <option role="mysqld">--local-infile</option> option enabled.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="changing-mysql-user">


Modified: trunk/refman-5.5/errors-problems-core.xml
===================================================================
--- trunk/refman-5.5/errors-problems-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/errors-problems-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 102; 4599 bytes

@@ -18,18 +18,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -1395,20 +1383,6 @@
           should set a larger value for this variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -1980,20 +1954,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3032,18 +2992,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3847,19 +3795,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -3947,19 +3882,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4878,18 +4800,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5269,18 +5179,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-5.5/extending-mysql.xml
===================================================================
--- trunk/refman-5.5/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 694 bytes

@@ -163,18 +163,6 @@
         replication, and event threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-5.5/installing-core.xml
===================================================================
--- trunk/refman-5.5/installing-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/installing-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 25; 1382 bytes

@@ -3706,18 +3706,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The data directory is located within the
         <filename>AppData</filename> directory for the user running

@@ -11337,19 +11325,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on start-up options appropriate to your
-            circumstances, subscribe to The MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Storage engines will use default option values if you specify
           none, but it is recommended that you review the available


Modified: trunk/refman-5.5/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.5/installing-updowngrade.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/installing-updowngrade.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 32; 1924 bytes

@@ -382,22 +382,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading

@@ -905,22 +889,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading


Modified: trunk/refman-5.5/introduction.xml
===================================================================
--- trunk/refman-5.5/introduction.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/introduction.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 24; 1329 bytes

@@ -2138,18 +2138,6 @@
           situations.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on choosing and tuning storage engines,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the nontransactional

@@ -2823,18 +2811,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          To be alerted when there is no form of server-enforced data
-          integrity, subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following sections describe how MySQL Server handles
         different types of constraints.


Modified: trunk/refman-5.5/language-structure-core.xml
===================================================================
--- trunk/refman-5.5/language-structure-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/language-structure-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -1374,19 +1374,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database, table, and trigger names are not case


Modified: trunk/refman-5.5/optimization.xml
===================================================================
--- trunk/refman-5.5/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 17, Lines Added: 0, Lines Deleted: 218; 9600 bytes

@@ -187,18 +187,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -346,18 +334,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, define an easily extendable interface through which

@@ -1035,18 +1011,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -1461,19 +1425,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -3229,20 +3180,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -3259,18 +3196,6 @@
       <literal>InnoDB</literal> tables.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For optimization tips geared to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <bridgehead>Disk I/O</bridgehead>
 
     <indexterm>

@@ -6140,18 +6065,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -6222,18 +6135,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -6998,19 +6899,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -7307,20 +7195,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -8053,18 +7927,6 @@
           will not be using the query cache.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -8281,19 +8143,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -8538,18 +8387,6 @@
         is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -9068,18 +8905,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Lock contention can seriously degrade performance. The MySQL
-          Enterprise Monitor provides expert advice on avoiding this
-          problem. To subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="concurrent-inserts">

@@ -9798,20 +9623,6 @@
           open more tables than this to execute queries.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Performance may suffer if
-            <literal role="sysvar">table_open_cache</literal> is set too
-            low. For expert advice on the optimum value for this
-            variable, subscribe to the MySQL Enterprise Monitor. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           MySQL closes an unused table and removes it from the table
           cache under the following circumstances:

@@ -10838,18 +10649,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="disk-issues">

@@ -11583,23 +11382,6 @@
               increase the permissible temporary table size as described
               in <xref linkend="internal-temporary-tables"/>.
             </para>
-
-            <formalpara role="mnmas">
-
-              <title>MySQL Enterprise</title>
-
-              <para>
-                Subscribers to the MySQL Enterprise Monitor are alerted
-                when temporary tables exceed
-                <literal role="sysvar">tmp_table_size</literal>.
-                Advisors make recommendations for the optimum value of
-                <literal role="sysvar">tmp_table_size</literal> based on
-                actual table usage. For more information about the MySQL
-                Enterprise Monitor please see
-                &base-url-enterprise;advisors.html.
-              </para>
-
-            </formalpara>
           </listitem>
 
           <listitem>


Modified: trunk/refman-5.5/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.5/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3073 bytes

@@ -578,18 +578,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1848,18 +1836,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6001,19 +5977,6 @@
         </para>
       </warning>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
     <refsection id="mysqlbinlog-hexdump">

@@ -7623,22 +7586,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -7857,18 +7804,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.5/programs-client-core.xml
===================================================================
--- trunk/refman-5.5/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4773 bytes

@@ -723,19 +723,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1292,18 +1279,6 @@
             format. This prevents connections except for servers that
             use the newer password format.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3471,18 +3446,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server status variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3568,19 +3531,6 @@
             stores the password using the old (pre-4.1) password-hashing
             format. (See <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3742,18 +3692,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4907,18 +4845,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8393,22 +8319,6 @@
         <xref linkend="view-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8899,19 +8809,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.5/replication-configuration.xml
===================================================================
--- trunk/refman-5.5/replication-configuration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/replication-configuration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 809 bytes

@@ -2544,18 +2544,6 @@
       status of each slave periodically, daily, or even more frequently.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For regular reports regarding the status of your slaves,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="replication-administration-status">
 
       <title>Checking Replication Status</title>


Modified: trunk/refman-5.5/replication-implementation.xml
===================================================================
--- trunk/refman-5.5/replication-implementation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/replication-implementation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 783 bytes

@@ -157,18 +157,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates


Modified: trunk/refman-5.5/replication-notes.xml
===================================================================
--- trunk/refman-5.5/replication-notes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/replication-notes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1629 bytes

@@ -2765,18 +2765,6 @@
         would produce no such error, causing replication to stop.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For instant notification when a slave thread terminates,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-sql-mode">

@@ -3762,18 +3750,6 @@
 
     <title>Replication FAQ</title>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on replication, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <qandaset>
 
       <qandaentry>

@@ -4525,18 +4501,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.5/replication-options-core.xml
===================================================================
--- trunk/refman-5.5/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -2917,19 +2917,6 @@
           variables can be useful for tuning the size of this variable.
           See <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal>,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.5/replication.xml
===================================================================
--- trunk/refman-5.5/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 839 bytes

@@ -158,18 +158,6 @@
     <xref linkend="replication-implementation"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that
-      provide immediate feedback about replication-related problems. For
-      more information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-implementation.xml"/>


Modified: trunk/refman-5.5/se-federated.xml
===================================================================
--- trunk/refman-5.5/se-federated.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/se-federated.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 989 bytes

@@ -44,22 +44,6 @@
     MySQL source distribution.
   </para>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find MySQL Knowledge Base
-      articles about the <literal>FEDERATED</literal> storage engine at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=272">
-      FEDERATED Storage Engine</ulink>. Access to the Knowledge Base
-      collection of articles is one of the advantages of subscribing to
-      MySQL Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="federated-description">
 
     <title><literal>FEDERATED</literal> Storage Engine Overview</title>


Modified: trunk/refman-5.5/se-innodb-core.xml
===================================================================
--- trunk/refman-5.5/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 37; 1834 bytes

@@ -247,18 +247,6 @@
       about <literal>InnoDB</literal>-related configuration parameters.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For advice on settings suitable to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <bridgehead>Considerations for Storage Devices</bridgehead>
 
     <para>

@@ -1310,18 +1298,6 @@
       <xref linkend="innodb-performance"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="5.5:mysqld:section-innodb">
       <citetitle><literal>InnoDB</literal> Option/Variable
       Reference</citetitle>

@@ -10162,19 +10138,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-5.5/se-myisam-core.xml
===================================================================
--- trunk/refman-5.5/se-myisam-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/se-myisam-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1292 bytes

@@ -491,19 +491,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise Monitor receive notification if
-        the <option role="mysqld">--myisam-recover-options</option>
-        option has not been set. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       If the recovery wouldn't be able to recover all rows from
       previously completed statements and you didn't specify

@@ -1083,19 +1070,6 @@
         Internals: Porting</ulink>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Find out about problems before they occur. Subscribe to the
-          MySQL Enterprise Monitor for expert advice about the state of
-          your servers. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-table-close">


Modified: trunk/refman-5.5/spatial-extensions.xml
===================================================================
--- trunk/refman-5.5/spatial-extensions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/spatial-extensions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 864 bytes

@@ -1441,8 +1441,8 @@
             operation. For example, the following statements both
             extract the X-coordinate from a <literal>Point</literal>
             object. The first produces the object directly using the
-            <literal role="function">POINT()</literal> function. The second
-            uses a WKT representation converted to a
+            <literal role="function">POINT()</literal> function. The
+            second uses a WKT representation converted to a
             <literal>Point</literal> with
             <literal>GeomFromText()</literal>.
           </para>


Modified: trunk/refman-5.5/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1952 bytes

@@ -163,20 +163,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-event">

@@ -3093,19 +3079,6 @@
       must be unique within the prefix.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only

@@ -6740,18 +6713,6 @@
       <literal>TEMPORARY</literal> table or a view.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on creating triggers, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal role="stmt">CREATE TRIGGER</literal> requires the
       <literal role="priv">TRIGGER</literal> privilege for the table


Modified: trunk/refman-5.5/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 115; 5089 bytes

@@ -34,19 +34,6 @@
       </para>
     </important>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment it is always prudent to examine any
-        changes to users' accounts. The MySQL Enterprise Monitor
-        provides notification whenever users' privileges are altered.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="create-user">
 
       <title><literal role="stmt">CREATE USER</literal> Syntax</title>

@@ -356,18 +343,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -986,18 +961,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1778,18 +1741,6 @@
         executing <literal>SELECT CURRENT_USER()</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users without passwords,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -1839,18 +1790,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -3708,18 +3647,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -5698,21 +5625,6 @@
 
       <remark role="help-description-end"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -7200,19 +7112,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -8767,20 +8666,6 @@
         <literal role="statvar">Created_tmp_tables</literal> value.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
     </section>


Modified: trunk/refman-5.5/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-transactions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/sql-syntax-transactions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 820 bytes

@@ -1941,18 +1941,6 @@
       acts as the Transaction Manager.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on XA Distributed Transaction Support,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To carry out a global transaction, it is necessary to know which
       components are involved, and bring each component to a point when


Modified: trunk/refman-5.5/stored-routines.xml
===================================================================
--- trunk/refman-5.5/stored-routines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.5/stored-routines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1307 bytes

@@ -42,18 +42,6 @@
     table exists. See <xref linkend="mysql-upgrade"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      For expert advice on using stored procedures and functions,
-      subscribe to the MySQL Enterprise Monitor. For more information,
-      see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     Stored routines can be particularly useful in certain situations:
   </para>

@@ -250,20 +238,6 @@
       <xref linkend="c-api-multiple-queries"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        stored routines in the MySQL Enterprise Knowledge Base. Access
-        to this collection of articles is one of the advantages of
-        subscribing to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="stored-routines-privileges">


Modified: trunk/refman-5.6/apis-c.xml
===================================================================
--- trunk/refman-5.6/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3858 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1565,22 +1549,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -8771,22 +8739,6 @@
       <xref linkend="statement-repreparation"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13555,20 +13507,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -14924,22 +14862,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-5.6/backup.xml
===================================================================
--- trunk/refman-5.6/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -709,18 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -908,18 +896,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -2246,18 +2222,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-5.6/dba-log-files.xml
===================================================================
--- trunk/refman-5.6/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 2007 bytes

@@ -100,18 +100,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="log-tables">
 
     <title>Selecting General Query and Slow Query Log Output Destinations</title>

@@ -797,19 +785,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -2513,20 +2488,6 @@
       option is specified. See <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series;, the
       <option role="mysqld">--log-slow-admin-statements</option> server


Modified: trunk/refman-5.6/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.6/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 6, Lines Added: 0, Lines Deleted: 78; 3531 bytes

@@ -123,18 +123,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -6809,21 +6797,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -6928,19 +6901,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -10649,18 +10609,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -11378,20 +11326,6 @@
         <citetitle>Dynamic Variable Summary</citetitle>
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -11454,18 +11388,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. Variables with
       no version indicated were already present prior to MySQL


Modified: trunk/refman-5.6/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.6/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 73; 3648 bytes

@@ -446,21 +446,6 @@
           <literal role="priv">INSERT</literal> and
           <literal role="priv">CREATE</literal> privileges.)
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            In some circumstances, the
-            <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary&mdash;on slaves where there are no nonreplicated
-            tables, for instance. The MySQL Enterprise Monitor notifies
-            subscribers when accounts have inappropriate privileges. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -734,23 +719,6 @@
           Note that <emphasis>any</emphasis> global privilege is a
           privilege for the database.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -897,20 +865,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1868,20 +1822,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2954,19 +2894,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.6/dba-security-core.xml
===================================================================
--- trunk/refman-5.6/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 64; 3070 bytes

@@ -136,20 +136,6 @@
           is easy to remember and type, but difficult to guess for
           someone who does not know the sentence.
         </para>
-
-        <formalpara role="mnmas-kb">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            MySQL Enterprise subscribers can find an example of a
-            function that checks password security in the Knowledge Base
-            article, <ulink url="https://kb.mysql.com/view.php?id=5358">
-            Checking Password Complexity</ulink>. To subscribe to MySQL
-            Enterprise see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1077,19 +1063,6 @@
         <option role="mysqld">--old-passwords</option>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor are automatically
-          alerted whenever a server is running with the
-          <option role="mysqld">--old-passwords</option> option. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following scenarios are possible for running a 4.1 or later
         server:

@@ -1378,18 +1351,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -1690,18 +1651,6 @@
           server must support older client programs. See
           <xref linkend="password-hashing"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor offers advice on the security
-            implications of using this option. For subscription
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2063,19 +2012,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Security advisors notify subscribers to the MySQL Enterprise
-        Monitor whenever a server is started with the
-        <option role="mysqld">--local-infile</option> option enabled.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="changing-mysql-user">


Modified: trunk/refman-5.6/errors-problems-core.xml
===================================================================
--- trunk/refman-5.6/errors-problems-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/errors-problems-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 102; 4599 bytes

@@ -18,18 +18,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -1395,20 +1383,6 @@
           should set a larger value for this variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -1980,20 +1954,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3032,18 +2992,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3847,19 +3795,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -3947,19 +3882,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4884,18 +4806,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5275,18 +5185,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-5.6/extending-mysql.xml
===================================================================
--- trunk/refman-5.6/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 694 bytes

@@ -163,18 +163,6 @@
         replication, and event threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-5.6/installing-core.xml
===================================================================
--- trunk/refman-5.6/installing-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/installing-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 25; 1382 bytes

@@ -3706,18 +3706,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The data directory is located within the
         <filename>AppData</filename> directory for the user running

@@ -11337,19 +11325,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on start-up options appropriate to your
-            circumstances, subscribe to The MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Storage engines will use default option values if you specify
           none, but it is recommended that you review the available


Modified: trunk/refman-5.6/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.6/installing-updowngrade.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/installing-updowngrade.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 1105 bytes

@@ -373,22 +373,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading


Modified: trunk/refman-5.6/introduction.xml
===================================================================
--- trunk/refman-5.6/introduction.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/introduction.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 24; 1329 bytes

@@ -1485,18 +1485,6 @@
           situations.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on choosing and tuning storage engines,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the nontransactional

@@ -2170,18 +2158,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          To be alerted when there is no form of server-enforced data
-          integrity, subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following sections describe how MySQL Server handles
         different types of constraints.


Modified: trunk/refman-5.6/language-structure-core.xml
===================================================================
--- trunk/refman-5.6/language-structure-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/language-structure-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -1374,19 +1374,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database, table, and trigger names are not case


Modified: trunk/refman-5.6/optimization.xml
===================================================================
--- trunk/refman-5.6/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 17, Lines Added: 0, Lines Deleted: 219; 9709 bytes

@@ -187,18 +187,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -346,18 +334,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, define an easily extendable interface through which

@@ -5254,18 +5230,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -5680,19 +5644,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -6753,19 +6704,6 @@
             concurrent inserts), even in tables that have deleted rows.
             See <xref linkend="concurrent-inserts"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For optimization tips geared to your specific
-              circumstances, subscribe to the MySQL Enterprise Monitor.
-              For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -7742,20 +7680,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-index-statistics">

@@ -9621,18 +9545,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -9703,18 +9615,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -10475,19 +10375,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -10784,20 +10671,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -11522,18 +11395,6 @@
           will not be using the query cache.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -11750,19 +11611,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -11999,18 +11847,6 @@
         is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -12529,18 +12365,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Lock contention can seriously degrade performance. The MySQL
-          Enterprise Monitor provides expert advice on avoiding this
-          problem. To subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="concurrent-inserts">

@@ -13206,20 +13030,6 @@
         more tables than this to execute queries.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Performance may suffer if
-          <literal role="sysvar">table_open_cache</literal> is set too
-          low. For expert advice on the optimum value for this variable,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL closes an unused table and removes it from the table cache
         under the following circumstances:

@@ -14238,18 +14048,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="connection-threads">

@@ -14481,23 +14279,6 @@
             the permissible temporary table size as described in
             <xref linkend="internal-temporary-tables"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Subscribers to the MySQL Enterprise Monitor are alerted
-              when temporary tables exceed
-              <literal role="sysvar">tmp_table_size</literal>. Advisors
-              make recommendations for the optimum value of
-              <literal role="sysvar">tmp_table_size</literal> based on
-              actual table usage. For more information about the MySQL
-              Enterprise Monitor please see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.6/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.6/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3073 bytes

@@ -578,18 +578,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1848,18 +1836,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6128,19 +6104,6 @@
         </para>
       </warning>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
     <refsection id="mysqlbinlog-hexdump">

@@ -8166,22 +8129,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8400,18 +8347,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.6/programs-client-core.xml
===================================================================
--- trunk/refman-5.6/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4773 bytes

@@ -722,19 +722,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1219,18 +1206,6 @@
             format. This prevents connections except for servers that
             use the newer password format.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3396,18 +3371,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server status variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3493,19 +3456,6 @@
             stores the password using the old (pre-4.1) password-hashing
             format. (See <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3667,18 +3617,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4796,18 +4734,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8276,22 +8202,6 @@
         <xref linkend="view-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8782,19 +8692,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.6/replication-configuration.xml
===================================================================
--- trunk/refman-5.6/replication-configuration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/replication-configuration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 809 bytes

@@ -2544,18 +2544,6 @@
       status of each slave periodically, daily, or even more frequently.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For regular reports regarding the status of your slaves,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="replication-administration-status">
 
       <title>Checking Replication Status</title>


Modified: trunk/refman-5.6/replication-implementation.xml
===================================================================
--- trunk/refman-5.6/replication-implementation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/replication-implementation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 783 bytes

@@ -157,18 +157,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates


Modified: trunk/refman-5.6/replication-notes.xml
===================================================================
--- trunk/refman-5.6/replication-notes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/replication-notes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1629 bytes

@@ -2765,18 +2765,6 @@
         would produce no such error, causing replication to stop.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For instant notification when a slave thread terminates,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-sql-mode">

@@ -3762,18 +3750,6 @@
 
     <title>Replication FAQ</title>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on replication, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <qandaset>
 
       <qandaentry>

@@ -4525,18 +4501,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.6/replication-options-core.xml
===================================================================
--- trunk/refman-5.6/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -2903,19 +2903,6 @@
           variables can be useful for tuning the size of this variable.
           See <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal>,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.6/replication.xml
===================================================================
--- trunk/refman-5.6/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 839 bytes

@@ -161,18 +161,6 @@
     <xref linkend="replication-implementation"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that
-      provide immediate feedback about replication-related problems. For
-      more information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-implementation.xml"/>


Modified: trunk/refman-5.6/se-federated.xml
===================================================================
--- trunk/refman-5.6/se-federated.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/se-federated.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 989 bytes

@@ -44,22 +44,6 @@
     MySQL source distribution.
   </para>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find MySQL Knowledge Base
-      articles about the <literal>FEDERATED</literal> storage engine at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=272">
-      FEDERATED Storage Engine</ulink>. Access to the Knowledge Base
-      collection of articles is one of the advantages of subscribing to
-      MySQL Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="federated-description">
 
     <title><literal>FEDERATED</literal> Storage Engine Overview</title>


Modified: trunk/refman-5.6/se-innodb-core.xml
===================================================================
--- trunk/refman-5.6/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 49; 2265 bytes

@@ -248,18 +248,6 @@
       about <literal>InnoDB</literal>-related configuration parameters.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For advice on settings suitable to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <bridgehead>Considerations for Storage Devices</bridgehead>
 
     <para>

@@ -1311,18 +1299,6 @@
       <xref linkend="innodb-performance"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="5.6:mysqld:section-innodb">
       <citetitle><literal>InnoDB</literal> Option/Variable
       Reference</citetitle>

@@ -9237,18 +9213,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For optimization recommendations geared to your specific
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-monitors">

@@ -10556,19 +10520,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-5.6/se-myisam-core.xml
===================================================================
--- trunk/refman-5.6/se-myisam-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/se-myisam-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1292 bytes

@@ -485,19 +485,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise Monitor receive notification if
-        the <option role="mysqld">--myisam-recover-options</option>
-        option has not been set. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       If the recovery wouldn't be able to recover all rows from
       previously completed statements and you didn't specify

@@ -1077,19 +1064,6 @@
         Internals: Porting</ulink>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Find out about problems before they occur. Subscribe to the
-          MySQL Enterprise Monitor for expert advice about the state of
-          your servers. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-table-close">


Modified: trunk/refman-5.6/spatial-extensions.xml
===================================================================
--- trunk/refman-5.6/spatial-extensions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/spatial-extensions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 864 bytes

@@ -1441,8 +1441,8 @@
             operation. For example, the following statements both
             extract the X-coordinate from a <literal>Point</literal>
             object. The first produces the object directly using the
-            <literal role="function">POINT()</literal> function. The second
-            uses a WKT representation converted to a
+            <literal role="function">POINT()</literal> function. The
+            second uses a WKT representation converted to a
             <literal>Point</literal> with
             <literal>GeomFromText()</literal>.
           </para>


Modified: trunk/refman-5.6/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1952 bytes

@@ -163,20 +163,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-event">

@@ -3141,19 +3127,6 @@
       must be unique within the prefix.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only

@@ -6772,18 +6745,6 @@
       <literal>TEMPORARY</literal> table or a view.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on creating triggers, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal role="stmt">CREATE TRIGGER</literal> requires the
       <literal role="priv">TRIGGER</literal> privilege for the table


Modified: trunk/refman-5.6/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 115; 5089 bytes

@@ -34,19 +34,6 @@
       </para>
     </important>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment it is always prudent to examine any
-        changes to users' accounts. The MySQL Enterprise Monitor
-        provides notification whenever users' privileges are altered.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="create-user">
 
       <title><literal role="stmt">CREATE USER</literal> Syntax</title>

@@ -356,18 +343,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -986,18 +961,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1778,18 +1741,6 @@
         executing <literal>SELECT CURRENT_USER()</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users without passwords,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -1839,18 +1790,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -3708,18 +3647,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -5698,21 +5625,6 @@
 
       <remark role="help-description-end"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -7200,19 +7112,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -8817,20 +8716,6 @@
         <literal role="statvar">Created_tmp_tables</literal> value.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
     </section>


Modified: trunk/refman-5.6/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-transactions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/sql-syntax-transactions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 820 bytes

@@ -1941,18 +1941,6 @@
       acts as the Transaction Manager.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on XA Distributed Transaction Support,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To carry out a global transaction, it is necessary to know which
       components are involved, and bring each component to a point when


Modified: trunk/refman-5.6/stored-routines.xml
===================================================================
--- trunk/refman-5.6/stored-routines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-5.6/stored-routines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1307 bytes

@@ -42,18 +42,6 @@
     table exists. See <xref linkend="mysql-upgrade"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      For expert advice on using stored procedures and functions,
-      subscribe to the MySQL Enterprise Monitor. For more information,
-      see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     Stored routines can be particularly useful in certain situations:
   </para>

@@ -250,20 +238,6 @@
       <xref linkend="c-api-multiple-queries"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        stored routines in the MySQL Enterprise Knowledge Base. Access
-        to this collection of articles is one of the advantages of
-        subscribing to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="stored-routines-privileges">


Modified: trunk/refman-6.0/apis-c.xml
===================================================================
--- trunk/refman-6.0/apis-c.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/apis-c.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 78; 3875 bytes

@@ -99,22 +99,6 @@
     </para>
   </note>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using the C API in the Knowledge Base articles,
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;Category=17">
-      The C API</ulink>. Access to the MySQL Knowledge Base collection
-      of articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="c-api-data-structures">
 
     <title>C API Data Structures</title>

@@ -1565,22 +1549,6 @@
       <literal role="cfunc">mysql_error()</literal>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the C API functions in the Knowledge Base articles,
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;pagerRow=0&amp;category=17">
-        The C API</ulink>. Access to the MySQL Knowledge Base collection
-        of articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="mysql-affected-rows">
 
       <title><literal role="cfunc">mysql_affected_rows()</literal></title>

@@ -9043,22 +9011,6 @@
       information, see <xref linkend="statement-repreparation"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        using prepared statements in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5931"> How can I
-        create server-side prepared statements?</ulink>. Access to the
-        MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="c-api-prepared-statement-data-structures">

@@ -13842,20 +13794,6 @@
       <primary>mysql_store_result()</primary>
     </indexterm>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find articles about the C
-        API in the MySQL Knowledge Base. Access to the Knowledge Base
-        collection of articles is one of the advantages of subscribing
-        to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="null-mysql-store-result">
 
       <title>Why <literal role="cfunc">mysql_store_result()</literal> Sometimes

@@ -15224,22 +15162,6 @@
       treat the output from <command>mysql_config</command> as one word.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise will find an example client
-        program in the Knowledge Base article,
-        <ulink url="https://kb.mysql.com/view.php?id=5264"> Sample C
-        program using the embedded MySQL server library </ulink>. Access
-        to the MySQL Knowledge Base collection of articles is one of the
-        advantages of subscribing to MySQL Enterprise. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="c-api-linking-problems">
 
       <title>Problems Linking with the C API</title>


Modified: trunk/refman-6.0/backup.xml
===================================================================
--- trunk/refman-6.0/backup.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/backup.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1831 bytes

@@ -709,18 +709,6 @@
       <literal role="sysvar">tmpdir</literal> system variable.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides numerous advisors that
-        issue immediate warnings should replication issues arise. For
-        more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <emphasis role="bold">Recovering Corrupt Tables</emphasis>
     </para>

@@ -908,18 +896,6 @@
         This discussion uses <command>mysqldump</command>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on backups and replication, subscribe to the
-          MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Assume that we make a full backup of all our
         <literal>InnoDB</literal> tables in all databases using the

@@ -3517,18 +3493,6 @@
 shell&gt; <userinput>mysql -u root -p -e "source /tmp/statements.sql"</userinput>
 </programlisting>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For maximum data recovery, the MySQL Enterprise Monitor advises
-        subscribers to synchronize to disk at each write. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="point-in-time-recovery-times">
 
       <title>Point-in-Time Recovery Using Event Times</title>


Modified: trunk/refman-6.0/dba-log-files.xml
===================================================================
--- trunk/refman-6.0/dba-log-files.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/dba-log-files.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 2007 bytes

@@ -100,18 +100,6 @@
     keeping logs secure.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a number of advisors
-      specifically related to the various log files. For more
-      information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="log-tables">
 
     <title>Selecting General Query and Slow Query Log Output Destinations</title>

@@ -839,19 +827,6 @@
       <ulink url="http://forge.mysql.com/wiki/MySQL_Internals_Binary_Log"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The binary log can also be used to track significant DDL events.
-        Analyzing the binary log in this way is an integral part of the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To enable the binary log, start the server with the
       <option role="mysqld">--log-bin[=<replaceable>base_name</replaceable>]</option>

@@ -2645,20 +2620,6 @@
       option is specified. See <xref linkend="server-options"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Excessive table scans are indicative of missing or poorly
-        optimized indexes. Using an advisor specifically designed for
-        the task, the MySQL Enterprise Monitor can identify such
-        problems and offer advice on resolution. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In MySQL &current-series;, the
       <option role="mysqld">--log-slow-admin-statements</option> server


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 6, Lines Added: 0, Lines Deleted: 78; 3575 bytes

@@ -123,18 +123,6 @@
       <xref linkend="option-files"/>.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on setting command options, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <command>mysqld</command> reads options from the
       <literal>[mysqld]</literal> and <literal>[server]</literal>

@@ -7369,21 +7357,6 @@
           <xref linkend="too-many-connections"/>, for more information.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For notification that the maximum number of connections is
-            getting dangerously high and for advice on setting the
-            optimum value for
-            <literal role="sysvar">max_connections</literal> subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Increasing this value increases the number of file descriptors
           that <command>mysqld</command> requires. See

@@ -7488,19 +7461,6 @@
             1844674407370954752.
           </para>
         </note>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive
-            recommendations for the optimum setting for
-            <literal role="sysvar">max_heap_table_size</literal>. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -11661,18 +11621,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Expert use of server system variables is part of the service
-        offered by the MySQL Enterprise Monitor. To subscribe, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="using-system-variables">

@@ -12388,20 +12336,6 @@
 
       <para condition="dynamic:optvar:dynamicvarsummary" role="6.0:mysqld:dynamicvar:Dynmaic Variable Summary"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Improper configuration of system variables can adversely
-          affect performance and security. The MySQL Enterprise Monitor
-          continually monitors system variables and provides expert
-          advice about appropriate settings. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -12462,18 +12396,6 @@
       STATUS</literal> statement.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on using status variables, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The status variables have the following meanings. Variables with
       no version indicated were already present prior to MySQL


Modified: trunk/refman-6.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-6.0/dba-privilege-system.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/dba-privilege-system.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 73; 3648 bytes

@@ -446,21 +446,6 @@
           <literal role="priv">INSERT</literal> and
           <literal role="priv">CREATE</literal> privileges.)
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            In some circumstances, the
-            <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary&mdash;on slaves where there are no nonreplicated
-            tables, for instance. The MySQL Enterprise Monitor notifies
-            subscribers when accounts have inappropriate privileges. For
-            more information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -734,23 +719,6 @@
           Note that <emphasis>any</emphasis> global privilege is a
           privilege for the database.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The <literal role="priv">SHOW DATABASES</literal> privilege
-            should be granted only to users who need to see all the
-            databases on a MySQL server. Subscribers to the MySQL
-            Enterprise Monitor are alerted when servers are started
-            without the
-            <option role="mysqld">--skip-show-database</option> option.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -897,20 +865,6 @@
           column can change an account's password, and then connect to
           the MySQL server using that account.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Accounts with unnecessary global privileges constitute a
-            security risk. Subscribers to the MySQL Enterprise Monitor
-            are automatically alerted to the existence of such accounts.
-            For detailed information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
     </itemizedlist>

@@ -1873,20 +1827,6 @@
           name never matches the host part of account names. An IP
           wildcard value can match only IP numbers, not host names.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            An overly broad host specifier such as
-            <quote><literal>%</literal></quote> constitutes a security
-            risk. The MySQL Enterprise Monitor provides safeguards
-            against this kind of vulnerability. For more information,
-            see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2959,19 +2899,6 @@
           instructions on setting the initial passwords, see
           <xref linkend="default-privileges"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor enforces security-related best
-            practices. For example, subscribers are alerted whenever
-            there is any account without a password. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-6.0/dba-security-core.xml
===================================================================
--- trunk/refman-6.0/dba-security-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/dba-security-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 64; 3070 bytes

@@ -135,20 +135,6 @@
           is easy to remember and type, but difficult to guess for
           someone who does not know the sentence.
         </para>
-
-        <formalpara role="mnmas-kb">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            MySQL Enterprise subscribers can find an example of a
-            function that checks password security in the Knowledge Base
-            article, <ulink url="https://kb.mysql.com/view.php?id=5358">
-            Checking Password Complexity</ulink>. To subscribe to MySQL
-            Enterprise see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -1076,19 +1062,6 @@
         <option role="mysqld">--old-passwords</option>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor are automatically
-          alerted whenever a server is running with the
-          <option role="mysqld">--old-passwords</option> option. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following scenarios are possible for running a 4.1 or later
         server:

@@ -1377,18 +1350,6 @@
       discussion of the different password handling methods.)
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor enforces best practices for
-        maximizing the security of your servers. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       All other information is transferred as text, and can be read by
       anyone who is able to watch the connection. If the connection

@@ -1689,18 +1650,6 @@
           server must support older client programs. See
           <xref linkend="password-hashing"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            The MySQL Enterprise Monitor offers advice on the security
-            implications of using this option. For subscription
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>

@@ -2125,19 +2074,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Security advisors notify subscribers to the MySQL Enterprise
-        Monitor whenever a server is started with the
-        <option role="mysqld">--local-infile</option> option enabled.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="changing-mysql-user">


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/errors-problems.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 102; 4584 bytes

@@ -16,18 +16,6 @@
     list displays client program messages.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides a <quote>Virtual DBA</quote>
-      to assist with problem solving. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="error-sources">
 
     <title>Sources of Error Information</title>

@@ -1393,20 +1381,6 @@
           should set a larger value for this variable.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Subscribers to the MySQL Enterprise Monitor receive advice
-            on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable to
-            avoid failed connection attempts. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           <command>mysqld</command> actually permits
           <literal role="sysvar" condition="max_connections">max_connections+1</literal>

@@ -1978,20 +1952,6 @@
           it is enabled.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For reasons of security and performance the advisors
-            provided by the MySQL Enterprise Monitor pay special
-            attention to the <literal>Aborted_connects</literal> status
-            variable. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Other reasons for problems with aborted clients or aborted
           connections:

@@ -3030,18 +2990,6 @@
           well as generic instructions that apply to any system.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on security-related issues, subscribe to
-            the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <section id="resetting-permissions-windows">
 
           <title>Resetting the Root Password: Windows Systems</title>

@@ -3849,19 +3797,6 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For early notification of possible problems with your MySQL
-            configuration, subscribe to the MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="temporary-files">

@@ -3949,19 +3884,6 @@
           directory is located.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Advisors provided by the MySQL Enterprise Monitor
-            automatically detect excessive temporary table storage to
-            disk. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           When sorting (<literal>ORDER BY</literal> or <literal>GROUP
           BY</literal>), MySQL normally uses one or two temporary files.

@@ -4886,18 +4808,6 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            Ensure that your data is adequately protected by subscribing
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="deleting-from-related-tables">

@@ -5277,18 +5187,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on configuring MySQL servers for optimal
-          performance, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="table-definition-issues">


Modified: trunk/refman-6.0/extending-mysql.xml
===================================================================
--- trunk/refman-6.0/extending-mysql.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/extending-mysql.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 694 bytes

@@ -205,18 +205,6 @@
         replication, and event threads.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on thread management, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="mysql-test-suite">


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/installing-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 25; 1410 bytes

@@ -3741,18 +3741,6 @@
         in <xref linkend="option-files"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the start-up options appropriate to your
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         In MySQL 5.1.23 and earlier, the MySQL installer places the data
         directory directly under the directory where you install MySQL.

@@ -11008,19 +10996,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on start-up options appropriate to your
-            circumstances, subscribe to The MySQL Enterprise Monitor.
-            For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           Storage engines will use default option values if you specify
           none, but it is recommended that you review the available


Modified: trunk/refman-6.0/installing-updowngrade.xml
===================================================================
--- trunk/refman-6.0/installing-updowngrade.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/installing-updowngrade.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 16; 1105 bytes

@@ -373,22 +373,6 @@
         conversion on your original database instance.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          upgrading in the Knowledge Base articles found at
-          <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=41">
-          Upgrading</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following lists describe changes that may affect
         applications and that you should watch out for when upgrading


Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/introduction.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 24; 1329 bytes

@@ -1678,18 +1678,6 @@
           situations.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on choosing and tuning storage engines,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           But how do you use the features of MySQL Server to maintain
           rigorous integrity even with the nontransactional

@@ -2363,18 +2351,6 @@
         <xref linkend="server-sql-mode"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          To be alerted when there is no form of server-enforced data
-          integrity, subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following sections describe how MySQL Server handles
         different types of constraints.


Modified: trunk/refman-6.0/language-structure-core.xml
===================================================================
--- trunk/refman-6.0/language-structure-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/language-structure-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -1376,19 +1376,6 @@
         sensitivity, as described later in this section.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          <literal role="sysvar">lower_case_table_names</literal> is
-          just one of the system variables monitored by the MySQL
-          Enterprise Monitor. For information about subscribing to this
-          service, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <note>
         <para>
           Although database, table, and trigger names are not case


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/optimization.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 17, Lines Added: 0, Lines Deleted: 220; 9863 bytes

@@ -70,18 +70,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For instant notification of system bottlenecks, subscribe to the
-        MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="design-limitations">
 
       <title>MySQL Design Limitations and Tradeoffs</title>

@@ -229,18 +217,6 @@
         is almost useless.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on choosing the database engine suitable to
-          your circumstances, subscribe to the MySQL Enterprise Monitor.
-          For more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         To make your application <emphasis>really</emphasis> database
         independent, you should define an easily extendable interface

@@ -2175,18 +2151,6 @@
         see <xref linkend="unnamed-views"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to the MySQL Enterprise Monitor regularly receive
-          expert advice on optimization. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="estimating-performance">

@@ -2257,18 +2221,6 @@
         variable. See <xref linkend="server-parameters"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed to improve query performance. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -7859,18 +7811,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on avoiding excessive table scans,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           For small tables, a table scan often is appropriate and the
           performance impact is negligible. For large tables, try the

@@ -8266,19 +8206,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For more advice on optimizing the performance of your
-            server, subscribe to the MySQL Enterprise Monitor. Numerous
-            advisors are dedicated to monitoring performance. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="update-speed">

@@ -9311,19 +9238,6 @@
             concurrent inserts), even in tables that have deleted rows.
             See <xref linkend="concurrent-inserts"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For optimization tips geared to your specific
-              circumstances, subscribe to the MySQL Enterprise Monitor.
-              For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -10611,20 +10525,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient&mdash;actual table usage
-          is the best indicator. The MySQL Enterprise Monitor provides
-          expert advice on this topic. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-index-statistics">

@@ -10969,19 +10869,6 @@
         small to allocate the minimal number of block buffers (8).
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on identifying the optimum size for
-          <literal role="sysvar">key_buffer_size</literal>, subscribe to
-          the MySQL Enterprise Monitor. See
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         When the key cache is not operational, index files are accessed
         using only the native file system buffering provided by the

@@ -11278,20 +11165,6 @@
 init_file=/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>data-directory</replaceable>/mysqld_init.sql
 </programlisting>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For advice on how best to configure your
-            <filename>my.cnf/my.ini </filename> option file, subscribe
-            to MySQL Enterprise Monitor. Recommendations are based on
-            actual table usage. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <para>
           The statements in <filename>mysqld_init.sql</filename> are
           executed each time the server starts. The file should contain

@@ -12159,18 +12032,6 @@
           will not be using the query cache.
         </para>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For expert advice on configuring the query cache, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
         <note>
           <para>
             When using the Windows Configuration Wizard to install or

@@ -12387,19 +12248,6 @@
 
         </itemizedlist>
 
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            If the query cache is under-utilized, performance will
-            suffer. Advice on avoiding this problem is provided to
-            subscribers to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
-
       </section>
 
       <section id="query-cache-status-and-maintenance">

@@ -12636,18 +12484,6 @@
         <literal>MyISAM</literal> setup is very well tuned for this.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides expert advice on when to
-          use table-level locking and when to use row-level locking. To
-          subscribe, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         Table locking in MySQL is deadlock-free for storage engines that
         use table-level locking. Deadlock avoidance is managed by always

@@ -13187,19 +13023,6 @@
             your tables to <literal>InnoDB</literal>. See
             <xref linkend="innodb"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Lock contention can seriously degrade performance. The
-              MySQL Enterprise Monitor provides expert advice on
-              avoiding this problem. To subscribe, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
       </itemizedlist>

@@ -13837,20 +13660,6 @@
         more tables than this to execute queries.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Performance may suffer if
-          <literal role="sysvar">table_open_cache</literal> is set too
-          low. For expert advice on the optimum value for this variable,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL closes an unused table and removes it from the table cache
         under the following circumstances:

@@ -14920,18 +14729,6 @@
         engine, see <xref linkend="innodb-tuning"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on tuning system parameters, subscribe to
-          the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="connection-threads">

@@ -15441,23 +15238,6 @@
             the permissible temporary table size as described in
             <xref linkend="internal-temporary-tables"/>.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              Subscribers to the MySQL Enterprise Monitor are alerted
-              when temporary tables exceed
-              <literal role="sysvar">tmp_table_size</literal>. Advisors
-              make recommendations for the optimum value of
-              <literal role="sysvar">tmp_table_size</literal> based on
-              actual table usage. For more information about the MySQL
-              Enterprise Monitor please see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/programs-admin-util-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 5, Lines Added: 0, Lines Deleted: 65; 3073 bytes

@@ -578,18 +578,6 @@
         <xref linkend="myisam-table-maintenance"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on checking and repairing tables, subscribe
-          to the MySQL Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <important>
         <para>
           <emphasis>You must ensure that no other program is using the

@@ -1848,18 +1836,6 @@
             command or the <literal>SHOW INDEX FROM
             <replaceable>tbl_name</replaceable></literal> statement.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -6499,19 +6475,6 @@
         </para>
       </warning>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on the security implications of enabling
-          <literal>LOCAL</literal>, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
     <refsection id="mysqlbinlog-hexdump">

@@ -8128,22 +8091,6 @@
 shell&gt; <userinput>perldoc mysqlhotcopy</userinput>
 </programlisting>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqlhotcopy</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5919"> How Does
-          mysqlhotcopy Work?</ulink>. Access to the MySQL Knowledge Base
-          collection of articles is one of the advantages of subscribing
-          to MySQL Enterprise. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8362,18 +8309,6 @@
             converted to use. The default is <literal>MyISAM</literal>
             if this option is not given.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on choosing the optimum storage engine,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/programs-client-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 8, Lines Added: 0, Lines Deleted: 103; 4773 bytes

@@ -724,19 +724,6 @@
             <literal>LOCAL</literal> has no effect if the server does
             not also support it.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -1293,18 +1280,6 @@
             format. This prevents connections except for servers that
             use the newer password format.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on database security, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3471,18 +3446,6 @@
           <para>
             Display the server status variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server status variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3579,19 +3542,6 @@
             stores the password using the old (pre-4.1) password-hashing
             format. (See <xref linkend="password-hashing"/>.)
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of using
-              the <literal>old-password</literal> command, subscribe to
-              the MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -3793,18 +3743,6 @@
           <para>
             Display the server system variables and their values.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on using server system variables,
-              subscribe to the MySQL Enterprise Monitor. For more
-              information, see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -4963,18 +4901,6 @@
           <para>
             Analyze the tables.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on optimizing tables, subscribe to the
-              MySQL Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>

@@ -8385,22 +8311,6 @@
         <xref linkend="view-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas-kb">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          MySQL Enterprise subscribers will find more information about
-          <command>mysqldump</command> in the Knowledge Base article,
-          <ulink url="https://kb.mysql.com/view.php?id=5285"> How Can I
-          Avoid Inserting Duplicate Rows From a Dump File?</ulink>.
-          Access to the MySQL Knowledge Base collection of articles is
-          one of the advantages of subscribing to MySQL Enterprise. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </refsection>
 
   </refentry>

@@ -8891,19 +8801,6 @@
           <para>
             Read input files locally from the client host.
           </para>
-
-          <formalpara role="mnmas">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              For expert advice on the security implications of enabling
-              <literal>LOCAL</literal>, subscribe to the MySQL
-              Enterprise Monitor. For more information, see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/replication-configuration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 809 bytes

@@ -2568,18 +2568,6 @@
       status of each slave periodically, daily, or even more frequently.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For regular reports regarding the status of your slaves,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="replication-administration-status">
 
       <title>Checking Replication Status</title>


Modified: trunk/refman-6.0/replication-implementation.xml
===================================================================
--- trunk/refman-6.0/replication-implementation.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/replication-implementation.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 783 bytes

@@ -157,18 +157,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For constant monitoring of the status of slaves, subscribe to
-        the MySQL Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       In the preceding description, there are three threads per
       master/slave connection. A master that has multiple slaves creates


Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/replication-notes.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 36; 1629 bytes

@@ -2662,18 +2662,6 @@
         would produce no such error, causing replication to stop.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For instant notification when a slave thread terminates,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="replication-features-sql-mode">

@@ -3559,18 +3547,6 @@
 
     <title>Replication FAQ</title>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on replication, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <qandaset>
 
       <qandaentry>

@@ -4322,18 +4298,6 @@
           <xref linkend="replication-bugs"/>, for instructions on how to
           report it.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For immediate notification whenever a slave stops, subscribe
-            to the MySQL Enterprise Monitor. For more information, see
-            &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/replication-options-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 13; 871 bytes

@@ -2919,19 +2919,6 @@
           variables can be useful for tuning the size of this variable.
           See <xref linkend="binary-log"/>.
         </para>
-
-        <formalpara role="mnmas">
-
-          <title>MySQL Enterprise</title>
-
-          <para>
-            For recommendations on the optimum setting for
-            <literal role="sysvar">binlog_cache_size</literal>,
-            subscribe to the MySQL Enterprise Monitor. For more
-            information, see &base-url-enterprise;advisors.html.
-          </para>
-
-        </formalpara>
       </listitem>
 
       <listitem>


Modified: trunk/refman-6.0/replication.xml
===================================================================
--- trunk/refman-6.0/replication.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/replication.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 839 bytes

@@ -157,18 +157,6 @@
     <xref linkend="replication-implementation"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      The MySQL Enterprise Monitor provides numerous advisors that
-      provide immediate feedback about replication-related problems. For
-      more information, see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-configuration.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication-implementation.xml"/>


Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/se-innodb-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 49; 2273 bytes

@@ -269,18 +269,6 @@
       </para>
     </caution>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For advice on settings suitable to your specific circumstances,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       The examples shown here are representative. See
       <xref linkend="innodb-parameters"/> for additional information

@@ -1178,18 +1166,6 @@
       <xref linkend="dynamic-system-variables"/>).
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor provides expert advice on InnoDB
-        start-up options and related system variables. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-innodb">
       <citetitle><literal>InnoDB</literal> Option/Variable
       Reference</citetitle>

@@ -8463,18 +8439,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For optimization recommendations geared to your specific
-          circumstances, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-monitors">

@@ -9754,19 +9718,6 @@
 
       </itemizedlist>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor provides a number of advisors
-          specifically designed for monitoring InnoDB tables. In some
-          cases, these advisors can anticipate potential problems. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="innodb-troubleshooting-datadict">


Modified: trunk/refman-6.0/se-myisam-core.xml
===================================================================
--- trunk/refman-6.0/se-myisam-core.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/se-myisam-core.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1292 bytes

@@ -484,19 +484,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Subscribers to MySQL Enterprise Monitor receive notification if
-        the <option role="mysqld">--myisam-recover-options</option>
-        option has not been set. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       If the recovery wouldn't be able to recover all rows from
       previously completed statements and you didn't specify

@@ -1076,19 +1063,6 @@
         Internals: Porting</ulink>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Find out about problems before they occur. Subscribe to the
-          MySQL Enterprise Monitor for expert advice about the state of
-          your servers. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="myisam-table-close">


Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 39; 1952 bytes

@@ -163,20 +163,6 @@
 
     <remark role="help-description-end"/>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment, alteration of a database is not a
-        common occurrence and may indicate a security breach. Advisors
-        provided as part of the MySQL Enterprise Monitor automatically
-        alert you when data definition statements are issued. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="alter-event">

@@ -3153,19 +3139,6 @@
       must be unique within the prefix.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        Lack of proper indexes can greatly reduce performance. Subscribe
-        to the MySQL Enterprise Monitor for notification of inefficient
-        use of indexes. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal>FULLTEXT</literal> indexes are supported only for
       <literal>MyISAM</literal> tables and can include only

@@ -6643,18 +6616,6 @@
       <literal>TEMPORARY</literal> table or a view.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on creating triggers, subscribe to the MySQL
-        Enterprise Monitor. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       <literal role="stmt">CREATE TRIGGER</literal> requires the
       <literal role="priv">TRIGGER</literal> privilege for the table


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 9, Lines Added: 0, Lines Deleted: 115; 5089 bytes

@@ -34,19 +34,6 @@
       </para>
     </important>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        In a production environment it is always prudent to examine any
-        changes to users' accounts. The MySQL Enterprise Monitor
-        provides notification whenever users' privileges are altered.
-        For more information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <section id="create-user">
 
       <title><literal role="stmt">CREATE USER</literal> Syntax</title>

@@ -356,18 +343,6 @@
         </para>
       </important>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users with inappropriate
-          privileges, subscribe to the MySQL Enterprise Monitor. For
-          more information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         The following table summarizes the permissible
         <replaceable>priv_type</replaceable> privilege types that can be

@@ -991,18 +966,6 @@
         has a password.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The MySQL Enterprise Monitor specifically guards against user
-          accounts with no passwords. To find out more, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         <literal role="stmt">REVOKE</literal> does not remove
         <literal>mysql.user</literal> table entries; you must do that

@@ -1783,18 +1746,6 @@
         executing <literal>SELECT CURRENT_USER()</literal>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For automated notification of users without passwords,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
   </section>

@@ -1844,18 +1795,6 @@
         <xref linkend="innodb-restrictions"/>.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          For expert advice on optimizing tables, subscribe to the MySQL
-          Enterprise Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <para>
         MySQL uses the stored key distribution to decide the order in
         which tables should be joined when you perform a join on

@@ -4251,18 +4190,6 @@
 
     </itemizedlist>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        The MySQL Enterprise Monitor makes extensive use of system
-        variables to determine the state of your server. For more
-        information, see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       A <literal role="stmt" condition="set-option">SET</literal>
       statement can contain multiple variable assignments, separated by

@@ -6243,21 +6170,6 @@
 
       <remark role="help-description-end"/>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          The <literal>SHOW ENGINE
-          <replaceable>engine_name</replaceable> STATUS</literal>
-          statement provides valuable information about the state of
-          your server. For expert interpretation of this information,
-          subscribe to the MySQL Enterprise Monitor. For more
-          information, see &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
     </section>
 
     <section id="show-engines">

@@ -7751,19 +7663,6 @@
         <literal>Info</literal> field.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Subscribers to MySQL Enterprise Monitor receive instant
-          notification and expert advice on resolution when there are
-          too many concurrent processes. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
       <para>

@@ -9343,20 +9242,6 @@
         <literal role="statvar">Created_tmp_tables</literal> value.
       </para>
 
-      <formalpara role="mnmas">
-
-        <title>MySQL Enterprise</title>
-
-        <para>
-          Status variables provide valuable clues to the state of your
-          servers. For expert interpretation of the information provided
-          by status variables, subscribe to the MySQL Enterprise
-          Monitor. For more information, see
-          &base-url-enterprise;advisors.html.
-        </para>
-
-      </formalpara>
-
       <remark role="help-description-end"/>
 
     </section>


Modified: trunk/refman-6.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-transactions.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/sql-syntax-transactions.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 820 bytes

@@ -2500,18 +2500,6 @@
       acts as the Transaction Manager.
     </para>
 
-    <formalpara role="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For expert advice on XA Distributed Transaction Support,
-        subscribe to the MySQL Enterprise Monitor. For more information,
-        see &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
     <para>
       To carry out a global transaction, it is necessary to know which
       components are involved, and bring each component to a point when


Modified: trunk/refman-6.0/stored-routines.xml
===================================================================
--- trunk/refman-6.0/stored-routines.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-6.0/stored-routines.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 26; 1307 bytes

@@ -42,18 +42,6 @@
     table exists. See <xref linkend="mysql-upgrade"/>.
   </para>
 
-  <formalpara role="mnmas">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      For expert advice on using stored procedures and functions,
-      subscribe to the MySQL Enterprise Monitor. For more information,
-      see &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <para>
     Stored routines can be particularly useful in certain situations:
   </para>

@@ -250,20 +238,6 @@
       <xref linkend="c-api-multiple-queries"/>.
     </para>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find numerous articles about
-        stored routines in the MySQL Enterprise Knowledge Base. Access
-        to this collection of articles is one of the advantages of
-        subscribing to MySQL Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
   <section id="stored-routines-privileges">


Modified: trunk/refman-common/apis-php-mysqli.xml
===================================================================
--- trunk/refman-common/apis-php-mysqli.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/apis-php-mysqli.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 21, Lines Added: 119, Lines Deleted: 0; 22680 bytes

@@ -2873,54 +2873,71 @@
       <fieldsynopsis>
         <type>int</type><varname>affected_rows</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>client_info</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>client_version</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>connect_errno</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>connect_error</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>errno</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>error</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>field_count</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>client_version</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>host_info</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>protocol_version</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>server_info</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>server_version</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>info</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>mixed</type><varname>insert_id</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>sqlstate</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>thread_id</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>warning_count</varname>
       </fieldsynopsis>

@@ -2931,12 +2948,14 @@
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::autocommit</methodname> 
         <methodparam>
           <type>bool</type><parameter>mode</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::change_user</methodname> 
         <methodparam>

@@ -2951,38 +2970,46 @@
           <type>string</type><parameter>database</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli::character_set_name</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_get_client_info</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_get_client_version</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::close</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::commit</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_connect_errno</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_connect_error</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli</type><methodname>mysqli_connect</methodname> 
         <methodparam>

@@ -3009,116 +3036,138 @@
           <type>string</type><parameter>socket</parameter><initializer>=ini_get(&quot;mysqli.default_socket&quot;)</initializer>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::debug</methodname> 
         <methodparam>
           <type>string</type><parameter>message</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::dump_debug_info</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_errno</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_error</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_field_count</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>object</type><methodname>mysqli::get_charset</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli::get_client_info</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_get_client_version</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::get_connection_stats</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_get_host_info</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_get_proto_info</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_get_server_info</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_get_server_version</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_warning</type><methodname>mysqli::get_warnings</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_info</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli</type><methodname>mysqli::init</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_insert_id</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::kill</methodname> 
         <methodparam>
           <type>int</type><parameter>processid</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::more_results</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::multi_query</methodname> 
         <methodparam>
           <type>string</type><parameter>query</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::next_result</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::options</methodname> 
         <methodparam>

@@ -3129,10 +3178,12 @@
           <type>mixed</type><parameter>value</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::ping</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <modifier>public</modifier>
         <type>int</type><methodname>mysqli::poll</methodname> 

@@ -3156,12 +3207,14 @@
           <type>int</type><parameter>usec</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_stmt</type><methodname>mysqli::prepare</methodname> 
         <methodparam>
           <type>string</type><parameter>query</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli::query</methodname> 
         <methodparam>

@@ -3172,6 +3225,7 @@
           <type>int</type><parameter>resultmode</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::real_connect</methodname> 
         <methodparam>

@@ -3202,45 +3256,53 @@
           <type>int</type><parameter>flags</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli::escape_string</methodname> 
         <methodparam>
           <type>string</type><parameter>escapestr</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::real_query</methodname> 
         <methodparam>
           <type>string</type><parameter>query</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <modifier>public</modifier>
         <type>mysqli_result</type><methodname>mysqli::reap_async_query</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::rollback</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::select_db</methodname> 
         <methodparam>
           <type>string</type><parameter>dbname</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::set_charset</methodname> 
         <methodparam>
           <type>string</type><parameter>charset</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>void</type><methodname>mysqli_set_local_infile_default</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::set_local_infile_handler</methodname> 
         <methodparam>

@@ -3251,12 +3313,14 @@
           <type>callback</type><parameter>read_func</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_sqlstate</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli::ssl_set</methodname> 
         <methodparam>

@@ -3279,32 +3343,39 @@
           <type>string</type><parameter>cipher</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli::stat</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_stmt</type><methodname>mysqli::stmt_init</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_result</type><methodname>mysqli::store_result</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_thread_id</methodname> 
         <methodparam>
           <type>mysqli</type><parameter>link</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_thread_safe</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_result</type><methodname>mysqli::use_result</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_warning_count</methodname> 
         <methodparam>

@@ -14394,24 +14465,31 @@
       <fieldsynopsis>
         <type>int</type><varname>affected_rows</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>errno</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>error</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>field_count</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>insert_id</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>num_rows</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>param_count</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>string</type><varname>sqlstate</varname>
       </fieldsynopsis>

@@ -14422,12 +14500,14 @@
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_stmt::attr_get</methodname> 
         <methodparam>
           <type>int</type><parameter>attr</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::attr_set</methodname> 
         <methodparam>

@@ -14438,6 +14518,7 @@
           <type>int</type><parameter>mode</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::bind_param</methodname> 
         <methodparam>

@@ -14452,6 +14533,7 @@
           <type>mixed</type><parameter>...</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::bind_result</methodname> 
         <methodparam>

@@ -14462,84 +14544,100 @@
           <type>mixed</type><parameter>...</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::close</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>void</type><methodname>mysqli_stmt::data_seek</methodname> 
         <methodparam>
           <type>int</type><parameter>offset</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_stmt_errno</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_stmt_error</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::execute</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::fetch</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_stmt_field_count</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>void</type><methodname>mysqli_stmt::free_result</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>object</type><methodname>mysqli_stmt::get_warnings</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_stmt_insert_id</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_stmt_num_rows</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_stmt_param_count</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_stmt::prepare</methodname> 
         <methodparam>
           <type>string</type><parameter>query</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::reset</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mysqli_result</type><methodname>mysqli_stmt::result_metadata</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::send_long_data</methodname> 
         <methodparam>

@@ -14550,12 +14648,14 @@
           <type>string</type><parameter>data</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>string</type><methodname>mysqli_stmt_sqlstate</methodname> 
         <methodparam>
           <type>mysqli_stmt</type><parameter>stmt</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_stmt::store_result</methodname>
         <void/>

@@ -19086,12 +19186,15 @@
       <fieldsynopsis>
         <type>int</type><varname>current_field</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>field_count</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>array</type><varname>lengths</varname>
       </fieldsynopsis>
+       
       <fieldsynopsis>
         <type>int</type><varname>num_rows</varname>
       </fieldsynopsis>

@@ -19102,42 +19205,50 @@
           <type>mysqli_result</type><parameter>result</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_result::data_seek</methodname> 
         <methodparam>
           <type>int</type><parameter>offset</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_result::fetch_all</methodname> 
         <methodparam>
           <type>int</type><parameter>resulttype</parameter><initializer>=MYSQLI_NUM</initializer>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_result::fetch_array</methodname> 
         <methodparam>
           <type>int</type><parameter>resulttype</parameter><initializer>=MYSQLI_BOTH</initializer>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>array</type><methodname>mysqli_result::fetch_assoc</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>object</type><methodname>mysqli_result::fetch_field_direct</methodname> 
         <methodparam>
           <type>int</type><parameter>fieldnr</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>object</type><methodname>mysqli_result::fetch_field</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>array</type><methodname>mysqli_result::fetch_fields</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>object</type><methodname>mysqli_result::fetch_object</methodname> 
         <methodparam>

@@ -19148,32 +19259,38 @@
           <type>array</type><parameter>params</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>mixed</type><methodname>mysqli_result::fetch_row</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_num_fields</methodname> 
         <methodparam>
           <type>mysqli_result</type><parameter>result</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_result::field_seek</methodname> 
         <methodparam>
           <type>int</type><parameter>fieldnr</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>void</type><methodname>mysqli_result::free</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>array</type><methodname>mysqli_fetch_lengths</methodname> 
         <methodparam>
           <type>mysqli_result</type><parameter>result</parameter>
         </methodparam>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>int</type><methodname>mysqli_num_rows</methodname> 
         <methodparam>

@@ -22846,6 +22963,7 @@
         <type>void</type><methodname>mysqli_driver::embedded_server_end</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <type>bool</type><methodname>mysqli_driver::embedded_server_start</methodname> 
         <methodparam>

@@ -23136,6 +23254,7 @@
         <methodname>__construct</methodname>
         <void/>
       </methodsynopsis>
+       
       <methodsynopsis>
         <modifier>public</modifier>
         <type>void</type><methodname>next</methodname>


Modified: trunk/refman-common/apis-php.xml
===================================================================
--- trunk/refman-common/apis-php.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/apis-php.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 32; 1720 bytes

@@ -70,22 +70,6 @@
     <ulink url="http://www.php.net/">PHP Web site</ulink>.
   </para>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      MySQL and PHP in the Knowledge Base articles found at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=23">
-      PHP</ulink>. Access to the MySQL Knowledge Base collection of
-      articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;knowledgebase.html.
-    </para>
-
-  </formalpara>
-
   <para id="php-api-copyright">
     <emphasis>Portions of this section are Copyright (c) 1997-2008 the
     PHP Documentation Group</emphasis> This material may be distributed

@@ -251,22 +235,6 @@
 
     </orderedlist>
 
-    <formalpara role="mnmas-kb">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        MySQL Enterprise subscribers will find more information about
-        the mysqli extension in the Knowledge Base articles found at
-        <ulink url="https://kb.mysql.com/search.php?cat=search&amp;cat=search&amp;keywords=mysqli&amp;go=Go">
-        mysqli</ulink>. Access to the MySQL Knowledge Base collection of
-        articles is one of the advantages of subscribing to MySQL
-        Enterprise. For more information, see
-        &base-url-enterprise;advisors.html.
-      </para>
-
-    </formalpara>
-
   </section>
 
 </section>


Modified: trunk/refman-common/apis-python.xml
===================================================================
--- trunk/refman-common/apis-python.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/apis-python.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 17; 936 bytes

@@ -17,21 +17,4 @@
     <ulink url="http://sourceforge.net/projects/mysql-python/"/>.
   </para>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using Python with the MySQL API in the MySQL Knowledge Base
-      articles found at
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=24">
-      Python</ulink>. Access to the MySQL Knowledge Base collection of
-      articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
 </section>


Modified: trunk/refman-common/connector-j.xml
===================================================================
--- trunk/refman-common/connector-j.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/connector-j.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 31; 1620 bytes

@@ -114,22 +114,6 @@
 
   </itemizedlist>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      using JDBC with MySQL in the Knowledge Base articles about
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=10">
-      JDBC</ulink>. Access to the MySQL Knowledge Base collection of
-      articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="connector-j-versions">
 
     <title>Connector/J Versions</title>

@@ -1395,21 +1379,6 @@
             updatable result sets) methods to save changes back to the
             database.
           </para>
-
-          <formalpara role="mnmas-kb">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              MySQL Enterprise subscribers will find more information
-              about type conversion in the Knowledge Base article,
-              <ulink url="https://kb.mysql.com/view.php?id=4929"> Type
-              Conversions Supported by MySQL Connector/J</ulink>. To
-              subscribe to MySQL Enterprise see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
         </listitem>
 
         <listitem>


Modified: trunk/refman-common/connector-odbc.xml
===================================================================
--- trunk/refman-common/connector-odbc.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/connector-odbc.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 3, Lines Added: 0, Lines Deleted: 46; 2283 bytes

@@ -140,22 +140,6 @@
 
   </itemizedlist>
 
-  <formalpara role="mnmas-kb">
-
-    <title>MySQL Enterprise</title>
-
-    <para>
-      MySQL Enterprise subscribers will find more information about
-      MySQL and ODBC in the Knowledge Base articles about
-      <ulink url="https://kb.mysql.com/search.php?cat=search&amp;category=9">
-      ODBC</ulink>. Access to the MySQL Knowledge Base collection of
-      articles is one of the advantages of subscribing to MySQL
-      Enterprise. For more information, see
-      &base-url-enterprise;advisors.html.
-    </para>
-
-  </formalpara>
-
   <section id="connector-odbc-versions">
 
     <title>Connector/ODBC Versions</title>

@@ -7959,22 +7943,6 @@
 
           </itemizedlist>
 
-          <formalpara role="mnmas-kb">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              MySQL Enterprise subscribers will find more information
-              about using ODBC with Access in Knowledge Base articles
-              such as
-              <ulink url="https://kb.mysql.com/view.php?id=5309"> Use
-              MySQL-Specific Syntax with Microsoft Access</ulink>. To
-              subscribe to MySQL Enterprise see
-              &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
-
         </section>
 
         <section id="connector-odbc-usagenotes-apptips-microsoft-excel">

@@ -8038,20 +8006,6 @@
             rows</literal> option.
           </para>
 
-          <formalpara role="mnmas-kb">
-
-            <title>MySQL Enterprise</title>
-
-            <para>
-              MySQL Enterprise subscribers can find a discussion about
-              using VBA in the Knowledge Base article,
-              <ulink url="https://kb.mysql.com/view.php?id=5308">
-              MySQL-Specific Syntax with VBA</ulink>. To subscribe to
-              MySQL Enterprise see &base-url-enterprise;advisors.html.
-            </para>
-
-          </formalpara>
-
         </section>
 
         <section id="connector-odbc-usagenotes-apptips-microsoft-visualinterdev">


Modified: trunk/refman-common/what-is.en.xml
===================================================================
--- trunk/refman-common/what-is.en.xml	2010-08-24 08:55:42 UTC (rev 22408)
+++ trunk/refman-common/what-is.en.xml	2010-08-24 09:28:11 UTC (rev 22409)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 12; 640 bytes

@@ -782,18 +782,6 @@
 
     </itemizedlist>
 
-    <formalpara role ="mnmas">
-
-      <title>MySQL Enterprise</title>
-
-      <para>
-        For assistance in getting optimal performance from your MySQL
-        server subscribe to MySQL Enterprise. For more information, see
-        &base-url-enterprise;.
-      </para>
-
-    </formalpara>
-
     <para>
       Clients and Tools:
     </para>


Thread
svn commit - mysqldoc@docsrva: r22409 - in trunk: common dynamic-docs/faq innodb-plugin-1.0 refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 ref...mc.brown24 Aug