List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 26 2010 10:51pm
Subject:svn commit - mysqldoc@docsrva: r22474 - in trunk: . refman-5.1 refman-5.5 refman-5.6
View as plain text  
Author: paul
Date: 2010-08-27 00:51:41 +0200 (Fri, 27 Aug 2010)
New Revision: 22474

Log:
 r62721@frost:  paul | 2010-08-26 17:49:36 -0500
 Minor tweaks


Modified:
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-5.5/se-innodb-core.xml
   trunk/refman-5.6/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:62720
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:62721
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 22:51:22 UTC (rev 22473)
+++ trunk/refman-5.1/se-innodb-core.xml	2010-08-26 22:51:41 UTC (rev 22474)
Changed blocks: 4, Lines Added: 12, Lines Deleted: 12; 2629 bytes

@@ -710,11 +710,12 @@
         <literal>InnoDB</literal></title>
 
       <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:
+        To use <literal>InnoDB Plugin</literal> in MySQL
+        &current-series;, 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>

@@ -1437,9 +1438,8 @@
 
         <para>
           This option causes the server to behave as if the built-in
-          <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
+          <literal>InnoDB</literal> is not present, which enables
+          <literal>InnoDB Plugin</literal> to be used instead. See
           <xref linkend="replacing-builtin-innodb"/>.
         </para>
 

@@ -1462,8 +1462,8 @@
 
           <listitem>
             <para>
-              The server will not start if the default storage is set to
-              <literal role="se">InnoDB</literal>. Use
+              The server will not start if the default storage engine is
+              set to <literal role="se">InnoDB</literal>. Use
               <option role="mysqld">--default-storage-engine</option> to
               set the default to some other engine if necessary.
             </para>

@@ -1598,8 +1598,8 @@
           which causes the server to behave as if the built-in
           <literal>InnoDB</literal> is not present. For more
           information, see the description of
-          <option role="mysqld">--ignore-builtin-innodb</option> option
-          under <quote><literal>InnoDB</literal> Command Options</quote>
+          <option role="mysqld">--ignore-builtin-innodb</option> under
+          <quote><literal>InnoDB</literal> Command Options</quote>
           earlier in this section. This variable was added in MySQL
           5.1.33.
         </para>


Modified: trunk/refman-5.5/se-innodb-core.xml
===================================================================
--- trunk/refman-5.5/se-innodb-core.xml	2010-08-26 22:51:22 UTC (rev 22473)
+++ trunk/refman-5.5/se-innodb-core.xml	2010-08-26 22:51:41 UTC (rev 22474)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 6; 1688 bytes

@@ -1331,7 +1331,8 @@
 
         <para>
           This option causes the server to behave as if the built-in
-          <literal>InnoDB</literal> is not present:
+          <literal>InnoDB</literal> is not present. It has these
+          effects:
         </para>
 
         <itemizedlist>

@@ -1347,8 +1348,8 @@
 
           <listitem>
             <para>
-              The server will not start if the default storage is set to
-              <literal role="se">InnoDB</literal>. Use
+              The server will not start if the default storage engine is
+              set to <literal role="se">InnoDB</literal>. Use
               <option role="mysqld">--default-storage-engine</option> to
               set the default to some other engine if necessary.
             </para>

@@ -1477,9 +1478,9 @@
           <option role="mysqld">--ignore-builtin-innodb</option> option,
           which causes the server to behave as if the built-in
           <literal>InnoDB</literal> is not present. For more
-          information, ee the description of
-          <option role="mysqld">--ignore-builtin-innodb</option> option
-          under <quote><literal>InnoDB</literal> Command Options</quote>
+          information, see the description of
+          <option role="mysqld">--ignore-builtin-innodb</option> under
+          <quote><literal>InnoDB</literal> Command Options</quote>
           earlier in this section.
         </para>
       </listitem>


Modified: trunk/refman-5.6/se-innodb-core.xml
===================================================================
--- trunk/refman-5.6/se-innodb-core.xml	2010-08-26 22:51:22 UTC (rev 22473)
+++ trunk/refman-5.6/se-innodb-core.xml	2010-08-26 22:51:41 UTC (rev 22474)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 5; 1570 bytes

@@ -1332,7 +1332,8 @@
 
         <para>
           This option causes the server to behave as if the built-in
-          <literal>InnoDB</literal> is not present:
+          <literal>InnoDB</literal> is not present. It has these
+          effects:
         </para>
 
         <itemizedlist>

@@ -1348,8 +1349,8 @@
 
           <listitem>
             <para>
-              The server will not start if the default storage is set to
-              <literal role="se">InnoDB</literal>. Use
+              The server will not start if the default storage engine is
+              set to <literal role="se">InnoDB</literal>. Use
               <option role="mysqld">--default-storage-engine</option> to
               set the default to some other engine if necessary.
             </para>

@@ -1479,8 +1480,8 @@
           which causes the server to behave as if the built-in
           <literal>InnoDB</literal> is not present. For more
           information, see the description of
-          <option role="mysqld">--ignore-builtin-innodb</option> option
-          under <quote><literal>InnoDB</literal> Command Options</quote>
+          <option role="mysqld">--ignore-builtin-innodb</option> under
+          <quote><literal>InnoDB</literal> Command Options</quote>
           earlier in this section.
         </para>
       </listitem>


Thread
svn commit - mysqldoc@docsrva: r22474 - in trunk: . refman-5.1 refman-5.5 refman-5.6paul.dubois27 Aug