List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 26 2010 3:31pm
Subject:svn commit - mysqldoc@docsrva: r22471 - in trunk: . dynamic-docs/changelog refman-5.1
View as plain text  
Author: paul
Date: 2010-08-26 17:31:19 +0200 (Thu, 26 Aug 2010)
New Revision: 22471

Log:
 r62710@frost:  paul | 2010-08-26 10:27:10 -0500
 Factor out multiple instances of instructions on using InnoDB Plugin to
 separate section


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/refman-5.1/se-innodb-core.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41948
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62706
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41948
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62710
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2010-08-26 15:31:08 UTC (rev 22470)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2010-08-26 15:31:19 UTC (rev 22471)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 167; 7538 bytes

@@ -78231,175 +78231,11 @@
       </para>
 
       <para>
-        To use the <literal>InnoDB Plugin</literal>, you must disable
-        the built-in version of <literal>InnoDB</literal> that is also
-        included and instruct the server to use <literal>InnoDB
-        Plugin</literal> instead. To accomplish this, use the following
-        lines in your <filename>my.cnf</filename> file:
+        For instructions on replacing the built-in version of
+        <literal>InnoDB</literal> with <literal>InnoDB Plugin</literal>,
+        see <xref linkend="replacing-builtin-innodb"/>.
       </para>
 
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-</programlisting>
-
-      <para>
-        For the <option role="mysqld">plugin-load</option> option,
-        <literal>innodb</literal> is the name to associate with the
-        plugin and <filename>ha_innodb_plugin.so</filename> is the name
-        of the shared object library that contains the plugin code. The
-        extension of <filename>.so</filename> applies for Unix (and
-        similar) systems. For HP-UX on HPPA (11.11) or Windows, the
-        extension should be <filename>.sl</filename> or
-        <filename>.dll</filename>, respectively, rather than
-        <filename>.so</filename>.
-      </para>
-
-      <para>
-        If the server has problems finding the plugin when it starts up,
-        specify the pathname to the plugin directory. For example, if
-        plugins are located in the <filename>lib/mysql/plugin</filename>
-        directory under the MySQL installation directory and you have
-        installed MySQL at <filename>/usr/local/mysql</filename>, use
-        these lines in your <filename>my.cnf</filename> file:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-plugin_dir=/usr/local/mysql/lib/mysql/plugin
-</programlisting>
-
-      <para>
-        The previous examples show how to activate the storage engine
-        part of <literal>InnoDB Plugin,</literal> but the plugin also
-        implements several InnoDB-related
-        <literal>INFORMATION_SCHEMA</literal> tables. (For information
-        about these tables, see
-        <xref linkend="innodb-information-schema"/>.) To enable these
-        tables, include additional
-        <literal><replaceable>name</replaceable>=<replaceable>library</replaceable></literal>
-        pairs in the value of the
-        <option role="mysqld">plugin-load</option> option:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-  ;innodb_trx=ha_innodb_plugin.so
-  ;innodb_locks=ha_innodb_plugin.so
-  ;innodb_lock_waits=ha_innodb_plugin.so
-  ;innodb_cmp=ha_innodb_plugin.so
-  ;innodb_cmp_reset=ha_innodb_plugin.so
-  ;innodb_cmpmem=ha_innodb_plugin.so
-  ;innodb_cmpmem_reset=ha_innodb_plugin.so
-</programlisting>
-
-      <para>
-        The <option role="mysqld">plugin-load</option> option value as
-        shown here is formatted on multiple lines for display purposes
-        but should be written in <filename>my.cnf</filename> using a
-        single line without spaces in the option value. On Windows,
-        substitute <filename>.dll</filename> for each instance of the
-        <filename>.so</filename> extension.
-      </para>
-
-      <para>
-        After the server starts, verify that <literal>InnoDB
-        Plugin</literal> has been loaded by using the
-        <literal role="stmt">SHOW PLUGINS</literal> statement. For
-        example, if you have loaded the storage engine and the
-        <literal>INFORMATION_SCHEMA</literal> tables, the output should
-        include lines similar to these:
-      </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW PLUGINS;</userinput>
-+---------------------+--------+--------------------+...
-| Name                | Status | Type               |...
-+---------------------+--------+--------------------+...
-...
-| InnoDB              | ACTIVE | STORAGE ENGINE     |...
-| INNODB_TRX          | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_LOCKS        | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_LOCK_WAITS   | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMP          | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMP_RESET    | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMPMEM       | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMPMEM_RESET | ACTIVE | INFORMATION SCHEMA |...
-+---------------------+--------+--------------------+...
-</programlisting>
-
-      <para>
-        An alternative to using the
-        <option role="mysqld">plugin-load</option> option at server
-        startup is to use the <literal role="stmt">INSTALL
-        PLUGIN</literal> statement at runtime. First start the server
-        with the <option role="mysqld">ignore-builtin-innodb</option>
-        option to disable the built-in version of
-        <literal>InnoDB</literal>:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-</programlisting>
-
-      <para>
-        Then issue an <literal role="stmt">INSTALL PLUGIN</literal>
-        statement for each plugin that you want to load:
-      </para>
-
-<programlisting>
-mysql&gt; <userinput>INSTALL PLUGIN InnoDB SONAME 'ha_innodb_plugin.so';</userinput>
-mysql&gt; <userinput>INSTALL PLUGIN INNODB_TRX SONAME 'ha_innodb_plugin.so';</userinput>
-mysql&gt; <userinput>INSTALL PLUGIN INNODB_LOCKS SONAME 'ha_innodb_plugin.so';</userinput>
-...
-</programlisting>
-
-      <para>
-        <literal role="stmt">INSTALL PLUGIN</literal> need be issued
-        only once for each plugin. Installed plugins will be loaded
-        automatically on subsequent server restarts.
-      </para>
-
-      <para>
-        If you build MySQL from a source distribution, <literal>InnoDB
-        Plugin</literal> is one of the storage engines that is built by
-        default. Build MySQL the way you normally do; for example, by
-        using the instructions at <xref linkend="installing-source"/>.
-        After the build completes, you should find the plugin shared
-        object file under the <filename>storage/innodb_plugin</filename>
-        directory, and <command>make install</command> should install it
-        in the plugin directory. Configure MySQL to use <literal>InnoDB
-        Plugin</literal> as described earlier for binary distributions.
-      </para>
-
-      <para>
-        If you use <command>gcc</command>, <literal>InnoDB
-        Plugin</literal> cannot be compiled with <command>gcc</command>
-        3.x; you must use <command>gcc</command> 4.x instead.
-      </para>
-
-      <note>
-        <para>
-          In MySQL 5.5, the <literal>InnoDB Plugin</literal> is also
-          included, but it becomes the built-in version of
-          <literal>InnoDB</literal> in MySQL Server, replacing the
-          version previously included as the built-in
-          <literal>InnoDB</literal> engine. This means that if you use
-          <literal>InnoDB Plugin</literal> in MySQL 5.1 using the
-          instructions just given, you will need to remove
-          <option role="mysqld">ignore-builtin-innodb</option> and
-          <option role="mysqld">plugin-load</option> from your startup
-          options after an upgrade to MySQL 5.5 or the server will fail
-          to start.
-        </para>
-      </note>
-
     </message>
 
   </logentry>


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2010-08-26 15:31:08 UTC (rev 22470)
+++ trunk/refman-5.1/se-innodb-core.xml	2010-08-26 15:31:19 UTC (rev 22471)
Changed blocks: 3, Lines Added: 188, Lines Deleted: 155; 14765 bytes

@@ -169,158 +169,10 @@
       </para>
 
       <para>
-        To use the <literal>InnoDB Plugin</literal>, you must disable
-        the built-in version of <literal>InnoDB</literal> that is also
-        included and instruct the server to use <literal>InnoDB
-        Plugin</literal> instead. To accomplish this, use the following
-        lines in your <filename>my.cnf</filename> file:
+        For instructions on replacing the built-in version of
+        <literal>InnoDB</literal> with <literal>InnoDB Plugin</literal>,
+        see <xref linkend="replacing-builtin-innodb"/>.
       </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-</programlisting>
-
-      <para>
-        For the <option role="mysqld">plugin-load</option> option,
-        <literal>innodb</literal> is the name to associate with the
-        plugin and <filename>ha_innodb_plugin.so</filename> is the name
-        of the shared object library that contains the plugin code. The
-        extension of <filename>.so</filename> applies for Unix (and
-        similar) systems. For HP-UX on HPPA (11.11) or Windows, the
-        extension should be <filename>.sl</filename> or
-        <filename>.dll</filename>, respectively, rather than
-        <filename>.so</filename>.
-      </para>
-
-      <para>
-        If the server has problems finding the plugin when it starts up,
-        specify the pathname to the plugin directory. For example, if
-        plugins are located in the <filename>lib/mysql/plugin</filename>
-        directory under the MySQL installation directory and you have
-        installed MySQL at <filename>/usr/local/mysql</filename>, use
-        these lines in your <filename>my.cnf</filename> file:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-plugin_dir=/usr/local/mysql/lib/mysql/plugin
-</programlisting>
-
-      <para>
-        The previous examples show how to activate the storage engine
-        part of <literal>InnoDB Plugin,</literal> but the plugin also
-        implements several InnoDB-related
-        <literal>INFORMATION_SCHEMA</literal> tables. (For information
-        about these tables, see
-        <xref linkend="innodb-information-schema"/>.) To enable these
-        tables, include additional
-        <literal><replaceable>name</replaceable>=<replaceable>library</replaceable></literal>
-        pairs in the value of the
-        <option role="mysqld">plugin-load</option> option:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-plugin-load=innodb=ha_innodb_plugin.so
-  ;innodb_trx=ha_innodb_plugin.so
-  ;innodb_locks=ha_innodb_plugin.so
-  ;innodb_lock_waits=ha_innodb_plugin.so
-  ;innodb_cmp=ha_innodb_plugin.so
-  ;innodb_cmp_reset=ha_innodb_plugin.so
-  ;innodb_cmpmem=ha_innodb_plugin.so
-  ;innodb_cmpmem_reset=ha_innodb_plugin.so
-</programlisting>
-
-      <para>
-        The <option role="mysqld">plugin-load</option> option value as
-        shown here is formatted on multiple lines for display purposes
-        but should be written in <filename>my.cnf</filename> using a
-        single line without spaces in the option value. On Windows,
-        substitute <filename>.dll</filename> for each instance of the
-        <filename>.so</filename> extension.
-      </para>
-
-      <para>
-        After the server starts , verify that <literal>InnoDB
-        Plugin</literal> has been loaded by using the
-        <literal role="stmt">SHOW PLUGINS</literal> statement. For
-        example, if you have loaded the storage engine and the
-        <literal>INFORMATION_SCHEMA</literal> tables, the output should
-        include lines similar to these:
-      </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW PLUGINS;</userinput>
-+---------------------+--------+--------------------+...
-| Name                | Status | Type               |...
-+---------------------+--------+--------------------+...
-...
-| InnoDB              | ACTIVE | STORAGE ENGINE     |...
-| INNODB_TRX          | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_LOCKS        | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_LOCK_WAITS   | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMP          | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMP_RESET    | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMPMEM       | ACTIVE | INFORMATION SCHEMA |...
-| INNODB_CMPMEM_RESET | ACTIVE | INFORMATION SCHEMA |...
-+---------------------+--------+--------------------+...
-</programlisting>
-
-      <para>
-        An alternative to using the
-        <option role="mysqld">plugin-load</option> option at server
-        startup is to use the <literal role="stmt">INSTALL
-        PLUGIN</literal> statement at runtime. First start the server
-        with the <option role="mysqld">ignore-builtin-innodb</option>
-        option to disable the built-in version of
-        <literal>InnoDB</literal>:
-      </para>
-
-<programlisting>
-[mysqld]
-ignore-builtin-innodb
-</programlisting>
-
-      <para>
-        Then issue an <literal role="stmt">INSTALL PLUGIN</literal>
-        statement for each plugin that you want to load:
-      </para>
-
-<programlisting>
-mysql&gt; <userinput>INSTALL PLUGIN InnoDB SONAME 'ha_innodb_plugin.so';</userinput>
-mysql&gt; <userinput>INSTALL PLUGIN INNODB_TRX SONAME 'ha_innodb_plugin.so';</userinput>
-mysql&gt; <userinput>INSTALL PLUGIN INNODB_LOCKS SONAME 'ha_innodb_plugin.so';</userinput>
-...
-</programlisting>
-
-      <para>
-        <literal role="stmt">INSTALL PLUGIN</literal> need be issued
-        only once for each plugin. Installed plugins will be loaded
-        automatically on subsequent server restarts.
-      </para>
-
-      <para>
-        If you build MySQL from a source distribution, <literal>InnoDB
-        Plugin</literal> is one of the storage engines that is built by
-        default. Build MySQL the way you normally do; for example, by
-        using the instructions at <xref linkend="installing-source"/>.
-        After the build completes, you should find the plugin shared
-        object file under the <filename>storage/innodb_plugin</filename>
-        directory, and <command>make install</command> should install it
-        in the plugin directory. Configure MySQL to use <literal>InnoDB
-        Plugin</literal> as described earlier for binary distributions.
-      </para>
-
-      <para>
-        If you use <command>gcc</command>, <literal>InnoDB
-        Plugin</literal> cannot be compiled with <command>gcc</command>
-        3.x; you must use <command>gcc</command> 4.x instead.
-      </para>
     </listitem>
 
     <listitem>

@@ -846,6 +698,181 @@
       <xref linkend="large-page-support"/>.
     </para>
 
+    <section id="replacing-builtin-innodb">
+
+      <title>Using <literal>InnoDB Plugin</literal> Instead of the Built-In
+        <literal>InnoDB</literal></title>
+
+    </section>
+
+    <para>
+      To use the <literal>InnoDB Plugin</literal>, you must disable the
+      built-in version of <literal>InnoDB</literal> that is also
+      included and instruct the server to use <literal>InnoDB
+      Plugin</literal> instead. To accomplish this, use the following
+      lines in your <filename>my.cnf</filename> file:
+    </para>
+
+<programlisting>
+[mysqld]
+ignore-builtin-innodb
+plugin-load=innodb=ha_innodb_plugin.so
+</programlisting>
+
+    <para>
+      For the <option role="mysqld">plugin-load</option> option,
+      <literal>innodb</literal> is the name to associate with the plugin
+      and <filename>ha_innodb_plugin.so</filename> is the name of the
+      shared object library that contains the plugin code. The extension
+      of <filename>.so</filename> applies for Unix (and similar)
+      systems. For HP-UX on HPPA (11.11) or Windows, the extension
+      should be <filename>.sl</filename> or <filename>.dll</filename>,
+      respectively, rather than <filename>.so</filename>.
+    </para>
+
+    <para>
+      If the server has problems finding the plugin when it starts up,
+      specify the pathname to the plugin directory. For example, if
+      plugins are located in the <filename>lib/mysql/plugin</filename>
+      directory under the MySQL installation directory and you have
+      installed MySQL at <filename>/usr/local/mysql</filename>, use
+      these lines in your <filename>my.cnf</filename> file:
+    </para>
+
+<programlisting>
+[mysqld]
+ignore-builtin-innodb
+plugin-load=innodb=ha_innodb_plugin.so
+plugin_dir=/usr/local/mysql/lib/mysql/plugin
+</programlisting>
+
+    <para>
+      The previous examples show how to activate the storage engine part
+      of <literal>InnoDB Plugin,</literal> but the plugin also
+      implements several InnoDB-related
+      <literal>INFORMATION_SCHEMA</literal> tables. (For information
+      about these tables, see
+      <xref linkend="innodb-information-schema"/>.) To enable these
+      tables, include additional
+      <literal><replaceable>name</replaceable>=<replaceable>library</replaceable></literal>
+      pairs in the value of the
+      <option role="mysqld">plugin-load</option> option:
+    </para>
+
+<programlisting>
+[mysqld]
+ignore-builtin-innodb
+plugin-load=innodb=ha_innodb_plugin.so
+  ;innodb_trx=ha_innodb_plugin.so
+  ;innodb_locks=ha_innodb_plugin.so
+  ;innodb_lock_waits=ha_innodb_plugin.so
+  ;innodb_cmp=ha_innodb_plugin.so
+  ;innodb_cmp_reset=ha_innodb_plugin.so
+  ;innodb_cmpmem=ha_innodb_plugin.so
+  ;innodb_cmpmem_reset=ha_innodb_plugin.so
+</programlisting>
+
+    <para>
+      The <option role="mysqld">plugin-load</option> option value as
+      shown here is formatted on multiple lines for display purposes but
+      should be written in <filename>my.cnf</filename> using a single
+      line without spaces in the option value. On Windows, substitute
+      <filename>.dll</filename> for each instance of the
+      <filename>.so</filename> extension.
+    </para>
+
+    <para>
+      After the server starts, verify that <literal>InnoDB
+      Plugin</literal> has been loaded by using the
+      <literal role="stmt">SHOW PLUGINS</literal> statement. For
+      example, if you have loaded the storage engine and the
+      <literal>INFORMATION_SCHEMA</literal> tables, the output should
+      include lines similar to these:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW PLUGINS;</userinput>
++---------------------+--------+--------------------+...
+| Name                | Status | Type               |...
++---------------------+--------+--------------------+...
+...
+| InnoDB              | ACTIVE | STORAGE ENGINE     |...
+| INNODB_TRX          | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_LOCKS        | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_LOCK_WAITS   | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_CMP          | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_CMP_RESET    | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_CMPMEM       | ACTIVE | INFORMATION SCHEMA |...
+| INNODB_CMPMEM_RESET | ACTIVE | INFORMATION SCHEMA |...
++---------------------+--------+--------------------+...
+</programlisting>
+
+    <para>
+      An alternative to using the
+      <option role="mysqld">plugin-load</option> option at server
+      startup is to use the <literal role="stmt">INSTALL
+      PLUGIN</literal> statement at runtime. First start the server with
+      the <option role="mysqld">ignore-builtin-innodb</option> option to
+      disable the built-in version of <literal>InnoDB</literal>:
+    </para>
+
+<programlisting>
+[mysqld]
+ignore-builtin-innodb
+</programlisting>
+
+    <para>
+      Then issue an <literal role="stmt">INSTALL PLUGIN</literal>
+      statement for each plugin that you want to load:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>INSTALL PLUGIN InnoDB SONAME 'ha_innodb_plugin.so';</userinput>
+mysql&gt; <userinput>INSTALL PLUGIN INNODB_TRX SONAME 'ha_innodb_plugin.so';</userinput>
+mysql&gt; <userinput>INSTALL PLUGIN INNODB_LOCKS SONAME 'ha_innodb_plugin.so';</userinput>
+...
+</programlisting>
+
+    <para>
+      <literal role="stmt">INSTALL PLUGIN</literal> need be issued only
+      once for each plugin. Installed plugins will be loaded
+      automatically on subsequent server restarts.
+    </para>
+
+    <para>
+      If you build MySQL from a source distribution, <literal>InnoDB
+      Plugin</literal> is one of the storage engines that is built by
+      default. Build MySQL the way you normally do; for example, by
+      using the instructions at <xref linkend="installing-source"/>.
+      After the build completes, you should find the plugin shared
+      object file under the <filename>storage/innodb_plugin</filename>
+      directory, and <command>make install</command> should install it
+      in the plugin directory. Configure MySQL to use <literal>InnoDB
+      Plugin</literal> as described earlier for binary distributions.
+    </para>
+
+    <para>
+      If you use <command>gcc</command>, <literal>InnoDB
+      Plugin</literal> cannot be compiled with <command>gcc</command>
+      3.x; you must use <command>gcc</command> 4.x instead.
+    </para>
+
+    <note>
+      <para>
+        In MySQL 5.5, the <literal>InnoDB Plugin</literal> is also
+        included, but it becomes the built-in version of
+        <literal>InnoDB</literal> in MySQL Server, replacing the version
+        previously included as the built-in <literal>InnoDB</literal>
+        engine. This means that if you use <literal>InnoDB
+        Plugin</literal> in MySQL 5.1 using the instructions just given,
+        you will need to remove
+        <option role="mysqld">ignore-builtin-innodb</option> and
+        <option role="mysqld">plugin-load</option> from your startup
+        options after an upgrade to MySQL 5.5 or the server will fail to
+        start.
+      </para>
+    </note>
+
     <section id="multiple-tablespaces">
 
       <title>Using Per-Table Tablespaces</title>

@@ -1402,12 +1429,18 @@
 
         <para>
           This option causes the server to behave as if the built-in
-          <literal>InnoDB</literal> is not present. If <literal>InnoDB
-          Plugin</literal> is not used in place of the built-in
-          <literal>InnoDB</literal>, this option has the following
-          effects:
+          <literal>InnoDB</literal> is not present. It enables
+          <literal>InnoDB Plugin</literal> to be used instead of the
+          built-in version of <literal>InnoDB</literal>. See
+          <xref linkend="replacing-builtin-innodb"/>.
         </para>
 
+        <para>
+          If this option is given but <literal>InnoDB Plugin</literal>
+          is not used in place of the built-in
+          <literal>InnoDB</literal>, it has the following effects:
+        </para>
+
         <itemizedlist>
 
           <listitem>


Thread
svn commit - mysqldoc@docsrva: r22471 - in trunk: . dynamic-docs/changelog refman-5.1paul.dubois26 Aug