List:Commits« Previous MessageNext Message »
From:paul Date:January 23 2006 2:35am
Subject:svn commit - mysqldoc@docsrva: r995 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-23 03:35:22 +0100 (Mon, 23 Jan 2006)
New Revision: 995

Log:
 r6574@frost:  paul | 2006-01-22 20:33:35 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/storage-engines.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6573
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6574
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-4.1/database-administration.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -850,13 +850,10 @@
               The easiest way to ensure this is to always use
               <option>--external-locking</option> together with
               <option>--delay-key-write=OFF
-              --query-cache-size=0</option>.
+              --query-cache-size=0</option>. (This is not done by
+              default because in many setups it's useful to have a
+              mixture of the above options.)
             </para>
-
-            <para>
-              (This is not done by default because in many setups it is
-              useful to have a mixture of the above options.)
-            </para>
           </listitem>
 
           <listitem>
@@ -1163,11 +1160,10 @@
               <command>mysqld</command>, when it opens a
               <literal>MyISAM</literal> table, checks whether the table
               is marked as crashed or wasn't closed properly. (The last
-              option works only if you are running with
-              <option>--skip-external-locking</option>.) If this is the
-              case, <command>mysqld</command> runs a check on the table.
-              If the table was corrupted, <command>mysqld</command>
-              attempts to repair it.
+              option works only if you are running with external locking
+              disabled.) If this is the case, <command>mysqld</command>
+              runs a check on the table. If the table was corrupted,
+              <command>mysqld</command> attempts to repair it.
             </para>
 
             <para>
@@ -3348,9 +3344,10 @@
             </para>
 
             <para>
-              Note that <option>--external-locking</option> does not
-              offer any protection against index corruption for tables
-              that use delayed key writes.
+              Note that enabling external locking with
+              <option>--external-locking</option> doesn't offer any
+              protection against index corruption for tables that use
+              delayed key writes.
             </para>
 
             <para>
@@ -17236,13 +17233,26 @@
           <secondary>from crash</secondary>
         </indexterm>
 
+        <indexterm>
+          <primary>external locking</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>locking</primary>
+          <secondary>external</secondary>
+        </indexterm>
+
+        <remark role="todo">
+          [pd] This isn't especially clear regarding what is safe and
+          what's not.
+        </remark>
+
         <para>
-          If you run <command>mysqld</command> with
-          <option>--skip-external-locking</option> (which is the default
-          on some systems, such as Linux), you cannot reliably use
-          <command>myisamchk</command> to check a table when
-          <command>mysqld</command> is using the same table. If you can
-          be sure that no one is accessing the tables through
+          If you run <command>mysqld</command> with external locking
+          disabled (which is the default as of MySQL 4.0), you can't
+          reliably use <command>myisamchk</command> to check a table
+          when <command>mysqld</command> is using the same table. If you
+          can be sure that no one is accessing the tables through
           <command>mysqld</command> while you run
           <command>myisamchk</command>, you only have to do
           <command>mysqladmin flush-tables</command> before you start
@@ -17254,20 +17264,19 @@
         </para>
 
         <para>
-          If you are not using <option>--skip-external-locking</option>,
-          you can use <command>myisamchk</command> to check tables at
-          any time. While you do this, all clients that try to update
-          the table wait until <command>myisamchk</command> is ready
-          before continuing.
+          If the server is run with external locking enabled, you can
+          use <command>myisamchk</command> to check tables at any time.
+          While you do this, all clients that try to update the table
+          wait until <command>myisamchk</command> is ready before
+          continuing.
         </para>
 
         <para>
           If you use <command>myisamchk</command> to repair or optimize
           tables, you <emphasis>must</emphasis> always ensure that the
           <command>mysqld</command> server is not using the table (this
-          also applies if you are using
-          <option>--skip-external-locking</option>). If you do not take
-          down <command>mysqld</command>, you should at least do a
+          also applies if external locking is disabled). If you don't
+          stop <command>mysqld</command>, you should at least do a
           <command>mysqladmin flush-tables</command> before you run
           <command>myisamchk</command>. Your tables <emphasis>may become
           corrupted</emphasis> if the server and
@@ -17588,8 +17597,7 @@
         <para>
           The options that you can use for table maintenance with
           <command>myisamchk</command> and <command>isamchk</command>
-          are described in several of the earlier subsections of
-          <xref linkend="myisamchk"/>.
+          are described in <xref linkend="myisamchk"/>.
         </para>
 
         <para>
@@ -17621,7 +17629,7 @@
         </para>
 
         <para>
-          If the <command>mysqld</command> server is down, you should
+          If the <command>mysqld</command> server is stopped, you should
           use the <option>--update-state</option> option to tell
           <command>myisamchk</command> to mark the table as 'checked'.
         </para>
@@ -17947,7 +17955,7 @@
         </para>
 
 <programlisting>
-  35 0 * * 0 <replaceable>/path/to/</replaceable>myisamchk --fast --silent <replaceable>/path/to/datadir/</replaceable>*/*.MYI
+35 0 * * 0 <replaceable>/path/to/myisamchk</replaceable> --fast --silent <replaceable>/path/to/datadir/</replaceable>*/*.MYI
 </programlisting>
 
         <para>
@@ -17993,7 +18001,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamchk -r -s --sort-index -O sort_buffer_size=16M */*.MYI</userinput>
+shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
 
         <para>
@@ -18032,8 +18040,7 @@
             <para>
               Runs <command>myisamchk</command> in <quote>describe
               mode</quote> to produce a description of your table. If
-              you start the MySQL server using the
-              <option>--skip-external-locking</option> option,
+              you start the MySQL server with external locking disabled,
               <command>myisamchk</command> may report an error for a
               table that is updated while it runs. However, because
               <command>myisamchk</command> does not change the table in

Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-4.1/storage-engines.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -869,8 +869,8 @@
         server opens a <literal>MyISAM</literal> table, it checks
         whether the table is marked as crashed or whether the open count
         variable for the table is not 0 and you are running the server
-        with <option>--skip-external-locking</option>. If either of
-        these conditions is true, the following happens:
+        with external locking disabled. If either of these conditions is
+        true, the following happens:
       </para>
 
       <itemizedlist>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-5.0/database-administration.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -857,13 +857,10 @@
               The easiest way to ensure this is to always use
               <option>--external-locking</option> together with
               <option>--delay-key-write=OFF
-              --query-cache-size=0</option>.
+              --query-cache-size=0</option>. (This is not done by
+              default because in many setups it's useful to have a
+              mixture of the above options.)
             </para>
-
-            <para>
-              (This is not done by default because in many setups it's
-              useful to have a mixture of the above options.)
-            </para>
           </listitem>
 
           <listitem>
@@ -1212,11 +1209,10 @@
               <command>mysqld</command>, when it opens a
               <literal>MyISAM</literal> table, checks whether the table
               is marked as crashed or wasn't closed properly. (The last
-              option works only if you are running with
-              <option>--skip-external-locking</option>.) If this is the
-              case, <command>mysqld</command> runs a check on the table.
-              If the table was corrupted, <command>mysqld</command>
-              attempts to repair it.
+              option works only if you are running with external locking
+              disabled.) If this is the case, <command>mysqld</command>
+              runs a check on the table. If the table was corrupted,
+              <command>mysqld</command> attempts to repair it.
             </para>
 
             <para>
@@ -3958,9 +3954,10 @@
             </para>
 
             <para>
-              Note that <option>--external-locking</option> doesn't
-              offer any protection against index corruption for tables
-              that use delayed key writes.
+              Note that enabling external locking with
+              <option>--external-locking</option> doesn't offer any
+              protection against index corruption for tables that use
+              delayed key writes.
             </para>
           </listitem>
 
@@ -19492,13 +19489,26 @@
           <secondary>from crash</secondary>
         </indexterm>
 
+        <indexterm>
+          <primary>external locking</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>locking</primary>
+          <secondary>external</secondary>
+        </indexterm>
+
+        <remark role="todo">
+          [pd] This isn't especially clear regarding what is safe and
+          what's not.
+        </remark>
+
         <para>
-          If you run <command>mysqld</command> with
-          <option>--skip-external-locking</option> (which is the default
-          on some systems, such as Linux), you can't reliably use
-          <command>myisamchk</command> to check a table when
-          <command>mysqld</command> is using the same table. If you can
-          be sure that no one is accessing the tables through
+          If you run <command>mysqld</command> with external locking
+          disabled (which is the default as of MySQL 4.0), you can't
+          reliably use <command>myisamchk</command> to check a table
+          when <command>mysqld</command> is using the same table. If you
+          can be sure that no one is accessing the tables through
           <command>mysqld</command> while you run
           <command>myisamchk</command>, you only have to do
           <command>mysqladmin flush-tables</command> before you start
@@ -19510,20 +19520,19 @@
         </para>
 
         <para>
-          If you are not using <option>--skip-external-locking</option>,
-          you can use <command>myisamchk</command> to check tables at
-          any time. While you do this, all clients that try to update
-          the table wait until <command>myisamchk</command> is ready
-          before continuing.
+          If the server is run with external locking enabled, you can
+          use <command>myisamchk</command> to check tables at any time.
+          While you do this, all clients that try to update the table
+          wait until <command>myisamchk</command> is ready before
+          continuing.
         </para>
 
         <para>
           If you use <command>myisamchk</command> to repair or optimize
           tables, you <emphasis>must</emphasis> always ensure that the
           <command>mysqld</command> server is not using the table (this
-          also applies if you are using
-          <option>--skip-external-locking</option>). If you don't take
-          down <command>mysqld</command>, you should at least do a
+          also applies if external locking is disabled). If you don't
+          stop <command>mysqld</command>, you should at least do a
           <command>mysqladmin flush-tables</command> before you run
           <command>myisamchk</command>. Your tables <emphasis>may become
           corrupted</emphasis> if the server and
@@ -19839,8 +19848,8 @@
 
         <para>
           The options that you can use for table maintenance with
-          <command>myisamchk</command> are described in several of the
-          earlier subsections of <xref linkend="myisamchk"/>.
+          <command>myisamchk</command> are described in
+          <xref linkend="myisamchk"/>.
         </para>
 
         <para>
@@ -19871,7 +19880,7 @@
         </para>
 
         <para>
-          If the <command>mysqld</command> server is down, you should
+          If the <command>mysqld</command> server is stopped, you should
           use the <option>--update-state</option> option to tell
           <command>myisamchk</command> to mark the table as 'checked'.
         </para>
@@ -20184,7 +20193,7 @@
         </para>
 
 <programlisting>
-35 0 * * 0 /path/to/myisamchk --fast --silent /path/to/datadir/*/*.MYI
+35 0 * * 0 <replaceable>/path/to/myisamchk</replaceable> --fast --silent <replaceable>/path/to/datadir</replaceable>/*/*.MYI
 </programlisting>
 
         <para>
@@ -20230,7 +20239,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamchk -r -s --sort-index -O sort_buffer_size=16M */*.MYI</userinput>
+shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
 
       </section>
@@ -20260,8 +20269,7 @@
             <para>
               Runs <command>myisamchk</command> in <quote>describe
               mode</quote> to produce a description of your table. If
-              you start the MySQL server using the
-              <option>--skip-external-locking</option> option,
+              you start the MySQL server with external locking disabled,
               <command>myisamchk</command> may report an error for a
               table that is updated while it runs. However, because
               <command>myisamchk</command> doesn't change the table in

Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-5.0/storage-engines.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -872,8 +872,8 @@
         server opens a <literal>MyISAM</literal> table, it checks
         whether the table is marked as crashed or whether the open count
         variable for the table is not 0 and you are running the server
-        with <option>--skip-external-locking</option>. If either of
-        these conditions is true, the following happens:
+        with external locking disabled. If either of these conditions is
+        true, the following happens:
       </para>
 
       <itemizedlist>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-5.1/database-administration.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -892,13 +892,10 @@
               The easiest way to ensure this is to always use
               <option>--external-locking</option> together with
               <option>--delay-key-write=OFF
-              --query-cache-size=0</option>.
+              --query-cache-size=0</option>. (This is not done by
+              default because in many setups it's useful to have a
+              mixture of the above options.)
             </para>
-
-            <para>
-              (This is not done by default because in many setups it's
-              useful to have a mixture of the above options.)
-            </para>
           </listitem>
 
           <listitem>
@@ -1207,11 +1204,10 @@
               <command>mysqld</command>, when it opens a
               <literal>MyISAM</literal> table, checks whether the table
               is marked as crashed or wasn't closed properly. (The last
-              option works only if you are running with
-              <option>--skip-external-locking</option>.) If this is the
-              case, <command>mysqld</command> runs a check on the table.
-              If the table was corrupted, <command>mysqld</command>
-              attempts to repair it.
+              option works only if you are running with external locking
+              disabled.) If this is the case, <command>mysqld</command>
+              runs a check on the table. If the table was corrupted,
+              <command>mysqld</command> attempts to repair it.
             </para>
 
             <para>
@@ -3971,9 +3967,10 @@
             </para>
 
             <para>
-              Note that <option>--external-locking</option> doesn't
-              offer any protection against index corruption for tables
-              that use delayed key writes.
+              Note that enabling external locking with
+              <option>--external-locking</option> doesn't offer any
+              protection against index corruption for tables that use
+              delayed key writes.
             </para>
           </listitem>
 
@@ -19502,13 +19499,26 @@
           <secondary>from crash</secondary>
         </indexterm>
 
+        <indexterm>
+          <primary>external locking</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>locking</primary>
+          <secondary>external</secondary>
+        </indexterm>
+
+        <remark role="todo">
+          [pd] This isn't especially clear regarding what is safe and
+          what's not.
+        </remark>
+
         <para>
-          If you run <command>mysqld</command> with
-          <option>--skip-external-locking</option> (which is the default
-          on some systems, such as Linux), you can't reliably use
-          <command>myisamchk</command> to check a table when
-          <command>mysqld</command> is using the same table. If you can
-          be sure that no one is accessing the tables through
+          If you run <command>mysqld</command> with external locking
+          disabled (which is the default as of MySQL 4.0), you can't
+          reliably use <command>myisamchk</command> to check a table
+          when <command>mysqld</command> is using the same table. If you
+          can be sure that no one is accessing the tables through
           <command>mysqld</command> while you run
           <command>myisamchk</command>, you only have to do
           <command>mysqladmin flush-tables</command> before you start
@@ -19520,20 +19530,19 @@
         </para>
 
         <para>
-          If you are not using <option>--skip-external-locking</option>,
-          you can use <command>myisamchk</command> to check tables at
-          any time. While you do this, all clients that try to update
-          the table wait until <command>myisamchk</command> is ready
-          before continuing.
+          If the server is run with external locking enabled, you can
+          use <command>myisamchk</command> to check tables at any time.
+          While you do this, all clients that try to update the table
+          wait until <command>myisamchk</command> is ready before
+          continuing.
         </para>
 
         <para>
           If you use <command>myisamchk</command> to repair or optimize
           tables, you <emphasis>must</emphasis> always ensure that the
           <command>mysqld</command> server is not using the table (this
-          also applies if you are using
-          <option>--skip-external-locking</option>). If you don't take
-          down <command>mysqld</command>, you should at least do a
+          also applies if external locking is disabled). If you don't
+          stop <command>mysqld</command>, you should at least do a
           <command>mysqladmin flush-tables</command> before you run
           <command>myisamchk</command>. Your tables <emphasis>may become
           corrupted</emphasis> if the server and
@@ -19849,8 +19858,8 @@
 
         <para>
           The options that you can use for table maintenance with
-          <command>myisamchk</command> are described in several of the
-          earlier subsections of <xref linkend="myisamchk"/>.
+          <command>myisamchk</command> are described in
+          <xref linkend="myisamchk"/>.
         </para>
 
         <para>
@@ -19881,7 +19890,7 @@
         </para>
 
         <para>
-          If the <command>mysqld</command> server is down, you should
+          If the <command>mysqld</command> server is stopped, you should
           use the <option>--update-state</option> option to tell
           <command>myisamchk</command> to mark the table as 'checked'.
         </para>
@@ -20194,7 +20203,7 @@
         </para>
 
 <programlisting>
-35 0 * * 0 /path/to/myisamchk --fast --silent /path/to/datadir/*/*.MYI
+35 0 * * 0 <replaceable>/path/to/myisamchk</replaceable> --fast --silent <replaceable>/path/to/datadir</replaceable>/*/*.MYI
 </programlisting>
 
         <para>
@@ -20240,7 +20249,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamchk -r -s --sort-index -O sort_buffer_size=16M */*.MYI</userinput>
+shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
 
       </section>
@@ -20270,8 +20279,7 @@
             <para>
               Runs <command>myisamchk</command> in <quote>describe
               mode</quote> to produce a description of your table. If
-              you start the MySQL server using the
-              <option>--skip-external-locking</option> option,
+              you start the MySQL server with external locking disabled,
               <command>myisamchk</command> may report an error for a
               table that is updated while it runs. However, because
               <command>myisamchk</command> doesn't change the table in

Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml	2006-01-23 02:35:01 UTC (rev 994)
+++ trunk/refman-5.1/storage-engines.xml	2006-01-23 02:35:22 UTC (rev 995)
@@ -854,8 +854,8 @@
         server opens a <literal>MyISAM</literal> table, it checks
         whether the table is marked as crashed or whether the open count
         variable for the table is not 0 and you are running the server
-        with <option>--skip-external-locking</option>. If either of
-        these conditions is true, the following happens:
+        with external locking disabled. If either of these conditions is
+        true, the following happens:
       </para>
 
       <itemizedlist>

Thread
svn commit - mysqldoc@docsrva: r995 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul23 Jan