List:Commits« Previous MessageNext Message »
From:paul Date:January 27 2006 4:02am
Subject:svn commit - mysqldoc@docsrva: r1055 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-27 05:02:06 +0100 (Fri, 27 Jan 2006)
New Revision: 1055

Log:
 r6727@frost:  paul | 2006-01-26 20:45:15 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:01:47 UTC (rev 1054)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
@@ -11420,7 +11420,10 @@
           statements are not written to the binary log. As of MySQL
           4.1.1, they are written to the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>ANALYZE TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
       </section>
@@ -11950,7 +11953,7 @@
           statements are not written to the binary log. As of MySQL
           4.1.1, they are written to the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword(or its alias
-          <literal>LOCAL</literal>) is used. This has been done so that
+          <literal>LOCAL</literal>) is used. This is done so that
           <literal>OPTIMIZE TABLE</literal> statements used on a MySQL
           server acting as a replication master will be replicated by
           default to the replication slave.
@@ -12093,7 +12096,10 @@
           are not written to the binary log. As of MySQL 4.1.1, they are
           written to the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>REPAIR TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
         <para>
@@ -15903,9 +15909,9 @@
         <para>
           The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
-          assigned to the cache. However, the current implementation
-          assigns all the table's indexes to the cache, so there is no
-          reason to specify anything other than the table name.
+          assigned to the cache. The current implementation assigns all
+          the table's indexes to the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
         <para>
@@ -16089,8 +16095,9 @@
 
             <para>
               Defragment the query cache to better utilize its memory.
-              This statement does not remove any queries from the cache,
-              unlike <literal>RESET QUERY CACHE</literal>.
+              <literal>FLUSH QUERY CACHE</literal> does not remove any
+              queries from the cache, unlike <literal>RESET QUERY
+              CACHE</literal>.
             </para>
           </listitem>
 
@@ -16163,7 +16170,13 @@
           not written to the binary log. As of MySQL 4.1.1, they are
           written to the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>FLUSH</literal> statements used on a MySQL server
+          acting as a replication master will be replicated by default
+          to the replication slave.
+        </para>
+
+        <para>
           <emphasis role="bold">Note</emphasis>: <literal>FLUSH
           LOGS</literal>, <literal>FLUSH MASTER</literal>,
           <literal>FLUSH SLAVE</literal>, and <literal>FLUSH TABLES WITH
@@ -16242,7 +16255,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          When you do a <literal>KILL</literal>, a thread-specific kill
+          When you use <literal>KILL</literal>, a thread-specific kill
           flag is set for the thread. In most cases, it might take some
           time for the thread to die, because the kill flag is checked
           only at specific intervals:
@@ -16397,9 +16410,9 @@
         <para>
           The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
-          should be preloaded. However, the current implementation
-          preloads all the table's indexes into the cache, so there is
-          no reason to specify anything other than the table name.
+          should be preloaded. The current implementation preloads all
+          the table's indexes into the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
         <para>
@@ -16425,19 +16438,20 @@
 
         <para>
           The <literal>RESET</literal> statement is used to clear the
-          state of various server operations. It also acts as a stronger
-          version of the <literal>FLUSH</literal> statement. See
+          state of various server operations. You must have the
+          <literal>RELOAD</literal> privilege to execute
+          <literal>RESET</literal>.
+        </para>
+
+        <para>
+          <literal>RESET</literal> acts as a stronger version of the
+          <literal>FLUSH</literal> statement. See
           <xref linkend="flush"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          You must have the <literal>RELOAD</literal> privilege to
-          execute <literal>RESET</literal>.
-        </para>
-
-        <para>
           <replaceable>reset_option</replaceable> can be any of the
           following:
         </para>
@@ -16578,17 +16592,17 @@
         </para>
 
         <para>
-          If you have an active slave that currently is reading one of
-          the logs you are trying to delete, this statement does nothing
-          and fails with an error. However, if a slave is dormant and
-          you happen to purge one of the logs it wants to read, the
-          slave is unable to replicate once it comes up. The statement
-          is safe to run while slaves are replicating. You do not need
-          to stop them.
+          This statement is safe to run while slaves are replicating.
+          You do not need to stop them. If you have an active slave that
+          currently is reading one of the logs you are trying to delete,
+          this statement does nothing and fails with an error. However,
+          if a slave is dormant and you happen to purge one of the logs
+          it has yet to read, the slave will be unable to replicate
+          after it comes up.
         </para>
 
         <para>
-          To purge logs, follow this procedure:
+          To safely purge logs, follow this procedure:
         </para>
 
         <orderedlist>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:01:47 UTC (rev 1054)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
@@ -12589,7 +12589,10 @@
           <literal>ANALYZE TABLE</literal> statements are written to the
           binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>ANALYZE TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
       </section>
@@ -13115,7 +13118,7 @@
           <literal>OPTIMIZE TABLE</literal> statements are written to
           the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword(or its alias
-          <literal>LOCAL</literal>) is used. This has been done so that
+          <literal>LOCAL</literal>) is used. This is done so that
           <literal>OPTIMIZE TABLE</literal> statements used on a MySQL
           server acting as a replication master will be replicated by
           default to the replication slave.
@@ -13257,7 +13260,10 @@
           <literal>REPAIR TABLE</literal> statements are written to the
           binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>REPAIR TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
         <para>
@@ -17342,9 +17348,9 @@
         <para>
           The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
-          assigned to the cache. However, the current implementation
-          assigns all the table's indexes to the cache, so there is no
-          reason to specify anything other than the table name.
+          assigned to the cache. The current implementation assigns all
+          the table's indexes to the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
         <para>
@@ -17482,12 +17488,10 @@
             </para>
 
             <para>
-              Closes and reopens all log files. If you have specified an
-              update log file or a binary log file without an extension,
-              the extension number of the log file is incremented by one
-              relative to the previous file. If you have used an
-              extension in the file name, MySQL closes and reopens the
-              log file. On Unix, this is the same thing as sending a
+              Closes and reopens all log files. If binary logging is
+              enabled, the sequence number of the binary log file is
+              incremented by one relative to the previous file. On Unix,
+              this is the same thing as sending a
               <literal>SIGHUP</literal> signal to the
               <command>mysqld</command> server (except on some Mac OS X
               10.3 versions where <command>mysqld</command> ignores
@@ -17523,8 +17527,9 @@
 
             <para>
               Defragment the query cache to better utilize its memory.
-              This statement does not remove any queries from the cache,
-              unlike <literal>RESET QUERY CACHE</literal>.
+              <literal>FLUSH QUERY CACHE</literal> does not remove any
+              queries from the cache, unlike <literal>RESET QUERY
+              CACHE</literal>.
             </para>
           </listitem>
 
@@ -17595,7 +17600,13 @@
         <para>
           <literal>FLUSH</literal> statements are written to the binary
           log unless the optional <literal>NO_WRITE_TO_BINLOG</literal>
-          keyword (or its alias <literal>LOCAL</literal>) is used.
+          keyword (or its alias <literal>LOCAL</literal>) is used. This
+          is done so that <literal>FLUSH</literal> statements used on a
+          MySQL server acting as a replication master will be replicated
+          by default to the replication slave.
+        </para>
+
+        <para>
           <emphasis role="bold">Note</emphasis>: <literal>FLUSH
           LOGS</literal>, <literal>FLUSH MASTER</literal>,
           <literal>FLUSH SLAVE</literal>, and <literal>FLUSH TABLES WITH
@@ -17711,7 +17722,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          When you do a <literal>KILL</literal>, a thread-specific kill
+          When you use <literal>KILL</literal>, a thread-specific kill
           flag is set for the thread. In most cases, it might take some
           time for the thread to die, because the kill flag is checked
           only at specific intervals:
@@ -17859,9 +17870,9 @@
         <para>
           The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
-          should be preloaded. However, the current implementation
-          preloads all the table's indexes into the cache, so there is
-          no reason to specify anything other than the table name.
+          should be preloaded. The current implementation preloads all
+          the table's indexes into the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
       </section>
@@ -17882,19 +17893,20 @@
 
         <para>
           The <literal>RESET</literal> statement is used to clear the
-          state of various server operations. It also acts as a stronger
-          version of the <literal>FLUSH</literal> statement. See
+          state of various server operations. You must have the
+          <literal>RELOAD</literal> privilege to execute
+          <literal>RESET</literal>.
+        </para>
+
+        <para>
+          <literal>RESET</literal> acts as a stronger version of the
+          <literal>FLUSH</literal> statement. See
           <xref linkend="flush"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          You must have the <literal>RELOAD</literal> privilege to
-          execute <literal>RESET</literal>.
-        </para>
-
-        <para>
           <replaceable>reset_option</replaceable> can be any of the
           following:
         </para>
@@ -17910,7 +17922,7 @@
               Deletes all binary logs listed in the index file, resets
               the binary log index file to be empty, and creates a new
               binary log file. (Known as <literal>FLUSH MASTER</literal>
-              in previous versions of MySQL.) See
+              in versions of MySQL before 3.23.26.) See
               <xref linkend="replication-master-sql"/>.
             </para>
           </listitem>
@@ -17934,8 +17946,8 @@
               Makes the slave forget its replication position in the
               master binary logs. Also resets the relay log by deleting
               any existing relay log files and beginning a new one.
-              (Known as <literal>FLUSH SLAVE</literal> in previous
-              versions of MySQL.) See
+              (Known as <literal>FLUSH SLAVE</literal> in versions of
+              MySQL before 3.23.26.) See
               <xref linkend="replication-slave-sql"/>.
             </para>
           </listitem>
@@ -18036,17 +18048,17 @@
         </para>
 
         <para>
-          If you have an active slave that currently is reading one of
-          the logs you are trying to delete, this statement does nothing
-          and fails with an error. However, if a slave is dormant and
-          you happen to purge one of the logs it wants to read, the
-          slave is unable to replicate once it comes up. The statement
-          is safe to run while slaves are replicating. You do not need
-          to stop them.
+          This statement is safe to run while slaves are replicating.
+          You do not need to stop them. If you have an active slave that
+          currently is reading one of the logs you are trying to delete,
+          this statement does nothing and fails with an error. However,
+          if a slave is dormant and you happen to purge one of the logs
+          it has yet to read, the slave will be unable to replicate
+          after it comes up.
         </para>
 
         <para>
-          To purge logs, follow this procedure:
+          To safely purge logs, follow this procedure:
         </para>
 
         <orderedlist>
@@ -19517,8 +19529,8 @@
         </para>
 
         <para>
-          In previous versions of MySQL (before 4.0.5), this statement
-          was called <literal>SLAVE START</literal>. This usage is still
+          In old versions of MySQL (before 4.0.5), this statement was
+          called <literal>SLAVE START</literal>. This usage is still
           accepted in MySQL &current-series; for backward compatibility,
           but is deprecated.
         </para>
@@ -19564,8 +19576,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          In previous versions of MySQL (before 4.0.5), this statement
-          was called <literal>SLAVE STOP</literal>. This usage is still
+          In old versions of MySQL (before 4.0.5), this statement was
+          called <literal>SLAVE STOP</literal>. This usage is still
           accepted in MySQL &current-series; for backward compatibility,
           but is deprecated.
         </para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:01:47 UTC (rev 1054)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-27 04:02:06 UTC (rev 1055)
@@ -13080,7 +13080,10 @@
           <literal>ANALYZE TABLE</literal> statements are written to the
           binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>ANALYZE TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
       </section>
@@ -13606,7 +13609,7 @@
           <literal>OPTIMIZE TABLE</literal> statements are written to
           the binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword(or its alias
-          <literal>LOCAL</literal>) is used. This has been done so that
+          <literal>LOCAL</literal>) is used. This is done so that
           <literal>OPTIMIZE TABLE</literal> statements used on a MySQL
           server acting as a replication master will be replicated by
           default to the replication slave.
@@ -13746,7 +13749,10 @@
           <literal>REPAIR TABLE</literal> statements are written to the
           binary log unless the optional
           <literal>NO_WRITE_TO_BINLOG</literal> keyword (or its alias
-          <literal>LOCAL</literal>) is used.
+          <literal>LOCAL</literal>) is used. This is done so that
+          <literal>REPAIR TABLE</literal> statements used on a MySQL
+          server acting as a replication master will be replicated by
+          default to the replication slave.
         </para>
 
         <para>
@@ -17870,9 +17876,9 @@
         <para>
           The syntax of <literal>CACHE INDEX</literal> enables you to
           specify that only particular indexes from a table should be
-          assigned to the cache. However, the current implementation
-          assigns all the table's indexes to the cache, so there is no
-          reason to specify anything other than the table name.
+          assigned to the cache. The current implementation assigns all
+          the table's indexes to the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
         <para>
@@ -18010,12 +18016,10 @@
             </para>
 
             <para>
-              Closes and reopens all log files. If you have specified an
-              update log file or a binary log file without an extension,
-              the extension number of the log file is incremented by one
-              relative to the previous file. If you have used an
-              extension in the file name, MySQL closes and reopens the
-              log file. On Unix, this is the same thing as sending a
+              Closes and reopens all log files. If binary logging is
+              enabled, the sequence number of the binary log file is
+              incremented by one relative to the previous file. On Unix,
+              this is the same thing as sending a
               <literal>SIGHUP</literal> signal to the
               <command>mysqld</command> server (except on some Mac OS X
               10.3 versions where <command>mysqld</command> ignores
@@ -18051,8 +18055,9 @@
 
             <para>
               Defragment the query cache to better utilize its memory.
-              This statement does not remove any queries from the cache,
-              unlike <literal>RESET QUERY CACHE</literal>.
+              <literal>FLUSH QUERY CACHE</literal> does not remove any
+              queries from the cache, unlike <literal>RESET QUERY
+              CACHE</literal>.
             </para>
           </listitem>
 
@@ -18123,7 +18128,13 @@
         <para>
           <literal>FLUSH</literal> statements are written to the binary
           log unless the optional <literal>NO_WRITE_TO_BINLOG</literal>
-          keyword (or its alias <literal>LOCAL</literal>) is used.
+          keyword (or its alias <literal>LOCAL</literal>) is used. This
+          is done so that <literal>FLUSH</literal> statements used on a
+          MySQL server acting as a replication master will be replicated
+          by default to the replication slave.
+        </para>
+
+        <para>
           <emphasis role="bold">Note</emphasis>: <literal>FLUSH
           LOGS</literal>, <literal>FLUSH MASTER</literal>,
           <literal>FLUSH SLAVE</literal>, and <literal>FLUSH TABLES WITH
@@ -18142,7 +18153,7 @@
 
         <para>
           <emphasis role="bold">Note</emphasis>: It is not possible in
-          MySQL &current-version; to issue <literal>FLUSH</literal>
+          MySQL &current-series; to issue <literal>FLUSH</literal>
           statements within stored functions or triggers. However, you
           may use <literal>FLUSH</literal> in stored procedures, so long
           as these are not called from stored functions or triggers. See
@@ -18238,7 +18249,7 @@
         <remark role="help-description-end"/>
 
         <para>
-          When you do a <literal>KILL</literal>, a thread-specific kill
+          When you use <literal>KILL</literal>, a thread-specific kill
           flag is set for the thread. In most cases, it might take some
           time for the thread to die, because the kill flag is checked
           only at specific intervals:
@@ -18386,9 +18397,9 @@
         <para>
           The syntax of <literal>LOAD INDEX INTO CACHE</literal> enables
           you to specify that only particular indexes from a table
-          should be preloaded. However, the current implementation
-          preloads all the table's indexes into the cache, so there is
-          no reason to specify anything other than the table name.
+          should be preloaded. The current implementation preloads all
+          the table's indexes into the cache, so there is no reason to
+          specify anything other than the table name.
         </para>
 
       </section>
@@ -18409,19 +18420,20 @@
 
         <para>
           The <literal>RESET</literal> statement is used to clear the
-          state of various server operations. It also acts as a stronger
-          version of the <literal>FLUSH</literal> statement. See
+          state of various server operations. You must have the
+          <literal>RELOAD</literal> privilege to execute
+          <literal>RESET</literal>.
+        </para>
+
+        <para>
+          <literal>RESET</literal> acts as a stronger version of the
+          <literal>FLUSH</literal> statement. See
           <xref linkend="flush"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          You must have the <literal>RELOAD</literal> privilege to
-          execute <literal>RESET</literal>.
-        </para>
-
-        <para>
           <replaceable>reset_option</replaceable> can be any of the
           following:
         </para>
@@ -18437,7 +18449,7 @@
               Deletes all binary logs listed in the index file, resets
               the binary log index file to be empty, and creates a new
               binary log file. (Known as <literal>FLUSH MASTER</literal>
-              in previous versions of MySQL.) See
+              in versions of MySQL before 3.23.26.) See
               <xref linkend="replication-master-sql"/>.
             </para>
           </listitem>
@@ -18461,8 +18473,8 @@
               Makes the slave forget its replication position in the
               master binary logs. Also resets the relay log by deleting
               any existing relay log files and beginning a new one.
-              (Known as <literal>FLUSH SLAVE</literal> in previous
-              versions of MySQL.) See
+              (Known as <literal>FLUSH SLAVE</literal> in versions of
+              MySQL before 3.23.26.) See
               <xref linkend="replication-slave-sql"/>.
             </para>
           </listitem>
@@ -18563,17 +18575,17 @@
         </para>
 
         <para>
-          If you have an active slave that currently is reading one of
-          the logs you are trying to delete, this statement does nothing
-          and fails with an error. However, if a slave is dormant and
-          you happen to purge one of the logs it wants to read, the
-          slave is unable to replicate once it comes up. The statement
-          is safe to run while slaves are replicating. You do not need
-          to stop them.
+          This statement is safe to run while slaves are replicating.
+          You do not need to stop them. If you have an active slave that
+          currently is reading one of the logs you are trying to delete,
+          this statement does nothing and fails with an error. However,
+          if a slave is dormant and you happen to purge one of the logs
+          it has yet to read, the slave will be unable to replicate
+          after it comes up.
         </para>
 
         <para>
-          To purge logs, follow this procedure:
+          To safely purge logs, follow this procedure:
         </para>
 
         <orderedlist>
@@ -20041,8 +20053,8 @@
         </para>
 
         <para>
-          In previous versions of MySQL (before 4.0.5), this statement
-          was called <literal>SLAVE START</literal>. This usage is still
+          In old versions of MySQL (before 4.0.5), this statement was
+          called <literal>SLAVE START</literal>. This usage is still
           accepted in MySQL &current-series; for backward compatibility,
           but is deprecated.
         </para>
@@ -20088,8 +20100,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          In previous versions of MySQL (before 4.0.5), this statement
-          was called <literal>SLAVE STOP</literal>. This usage is still
+          In old versions of MySQL (before 4.0.5), this statement was
+          called <literal>SLAVE STOP</literal>. This usage is still
           accepted in MySQL &current-series; for backward compatibility,
           but is deprecated.
         </para>

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