List:Commits« Previous MessageNext Message »
From:paul.dubois Date:May 4 2010 12:20am
Subject:svn commit - mysqldoc@docsrva: r20402 - in trunk: . dynamic-docs/command-optvars refman-5.5 refman-6.0
View as plain text  
Author: paul
Date: 2010-05-04 02:20:41 +0200 (Tue, 04 May 2010)
New Revision: 20402

Log:
 r58526@frost:  paul | 2010-05-03 19:20:32 -0500
 --myisam-recover was not deprecated;
 it was renamed to --myisam-recover-options


Modified:
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-6.0/dba-mysqld-server-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:38723
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:58524
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:38723
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:58526
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/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2010-05-03 22:40:26 UTC (rev 20401)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2010-05-04 00:20:41 UTC (rev 20402)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 837 bytes

@@ -15334,8 +15334,6 @@
       Set the mode for automatic MyISAM recovery
     </shortdescription>
 
-    <deprecated version="5.5.3" xref="myisam-recover-options"/>
-
     <types>
       <optype class="cmdline" format="--myisam-recover[=name]" setvar="myisam_recover_options"/>
       <optype class="mycnf"/>

@@ -15355,7 +15353,9 @@
       <manual version="5.1"/>
       <manual version="5.4"/>
       <manual version="5.5"/>
+      <removed version="5.5.3"/>
       <manual version="6.0"/>
+      <removed version="6.0.14"/>
     </versions>
 
   </mysqloption>


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2010-05-03 22:40:26 UTC (rev 20401)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2010-05-04 00:20:41 UTC (rev 20402)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 8; 1849 bytes

@@ -1934,13 +1934,10 @@
           <option role="mysqld">--myisam-recover[=<replaceable>option</replaceable>[,<replaceable>option</replaceable>]...]]</option>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.5:mysqld:myisam-recover"/>
-
         <para>
-          This option is deprecated as of MySQL 5.5.3 in favor of
+          This option is renamed as of MySQL 5.5.3 to
           <option role="mysqld">--myisam-recover-options</option>. See
-          the description of that option for more information. The value
-          of <literal>OFF</literal> is unavailable before 5.5.3.
+          the description of that option for more information.
         </para>
       </listitem>
 

@@ -2032,12 +2029,21 @@
         </para>
 
         <para>
-          This variable was added in MySQL 5.5.3 to be used in
-          preference to <option role="mysqld">--myisam-recover</option>,
-          which is now deprecated.
+          This option was named
+          <option role="mysqld">--myisam-recover</option>, before MySQL
+          5.5.3. The old option name still works because it is
+          recognized as an unambiguous prefix of the new name,
+          <option role="mysqld">--myisam-recover-options</option>.
+          (Option prefix recognition occurs as described in
+          <xref linkend="program-options"/>.)
         </para>
 
         <para>
+          The option value <literal>OFF</literal> is available as of
+          MySQL 5.5.3.
+        </para>
+
+        <para>
           See <xref linkend="myisam-start"/>.
         </para>
       </listitem>


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2010-05-03 22:40:26 UTC (rev 20401)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2010-05-04 00:20:41 UTC (rev 20402)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 8; 1863 bytes

@@ -2093,13 +2093,10 @@
           <option role="mysqld">--myisam-recover-options[=<replaceable>option</replaceable>[,<replaceable>option</replaceable>]...]]</option>
         </para>
 
-        <para condition="dynamic:optvar:item" role="6.0:mysqld:myisam-recover"/>
-
         <para>
-          This option is deprecated as of MySQL 6.0.14 in favor of
+          This option is renamed as of MySQL 6.0.14 to
           <option role="mysqld">--myisam-recover-options</option>. See
-          the description of that option for more information. The value
-          of <literal>OFF</literal> is unavailable before 6.0.14.
+          the description of that option for more information.
         </para>
       </listitem>
 

@@ -2191,12 +2188,21 @@
         </para>
 
         <para>
-          This variable was added in MySQL 6.0.14 to be used in
-          preference to <option role="mysqld">--myisam-recover</option>,
-          which is now deprecated.
+          This option was named
+          <option role="mysqld">--myisam-recover</option>, before MySQL
+          6.0.14. The old option name still works because it is
+          recognized as an unambiguous prefix of the new name,
+          <option role="mysqld">--myisam-recover-options</option>.
+          (Option prefix recognition occurs as described in
+          <xref linkend="program-options"/>.)
         </para>
 
         <para>
+          The option value <literal>OFF</literal> is available as of
+          MySQL 6.0.14.
+        </para>
+
+        <para>
           See <xref linkend="myisam-start"/>.
         </para>
       </listitem>


Thread
svn commit - mysqldoc@docsrva: r20402 - in trunk: . dynamic-docs/command-optvars refman-5.5 refman-6.0paul.dubois4 May