List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 26 2010 3:59pm
Subject:svn commit - mysqldoc@docsrva: r22472 - in trunk: . refman-5.1
View as plain text  
Author: paul
Date: 2010-08-26 17:59:37 +0200 (Thu, 26 Aug 2010)
New Revision: 22472

Log:
 r62718@frost:  paul | 2010-08-26 10:59:25 -0500
 Fix validation, add xref


Modified:
   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: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
   + 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:62718
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/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2010-08-26 15:31:19 UTC (rev 22471)
+++ trunk/refman-5.1/se-innodb-core.xml	2010-08-26 15:59:37 UTC (rev 22472)
Changed blocks: 6, Lines Added: 110, Lines Deleted: 102; 11805 bytes

@@ -264,6 +264,12 @@
       default to some other engine if necessary.
     </para>
 
+    <para>
+      If you want to use <literal>InnoDB Plugin</literal> rather than
+      the built-in version of <literal>InnoDB</literal>, see
+      <xref linkend="replacing-builtin-innodb"/>.
+    </para>
+
     <caution>
       <para>
         <literal>InnoDB</literal> is a transaction-safe (ACID compliant)

@@ -703,41 +709,40 @@
       <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>
 
-    <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>
+        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>
+      <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]

@@ -746,18 +751,18 @@
 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>
+      <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]

@@ -772,23 +777,23 @@
   ;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>
+        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>
+      <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>

@@ -807,24 +812,25 @@
 +---------------------+--------+--------------------+...
 </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>
+      <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>
+      <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>

@@ -833,46 +839,48 @@
 ...
 </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>
+        <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 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.
+        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>
 
+      <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>
+
     <section id="multiple-tablespaces">
 
       <title>Using Per-Table Tablespaces</title>


Thread
svn commit - mysqldoc@docsrva: r22472 - in trunk: . refman-5.1paul.dubois26 Aug