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

Log:
 r6883@frost:  paul | 2006-01-29 20:00:29 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/replication.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.1/replication.xml


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

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-30 02:01:41 UTC (rev 1114)
+++ trunk/refman-4.1/replication.xml	2006-01-30 02:01:55 UTC (rev 1115)
@@ -2731,8 +2731,8 @@
           Disable or enable automatic purging of relay logs as soon as
           they are not needed any more. The default value is 1
           (enabled). This is a global variable that can be changed
-          dynamically with <literal>SET GLOBAL
-          relay_log_purge</literal>.
+          dynamically with <literal>SET GLOBAL relay_log_purge =
+          <replaceable>N</replaceable></literal>.
         </para>
 
         <para>
@@ -2741,23 +2741,27 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
         <para>
-          Place an upper limit on the total size of all relay logs on
-          the slave (a value of 0 means <quote>unlimited</quote>). This
-          is useful for a slave server host that has limited disk space.
-          When the limit is reached, the I/O thread stops reading binary
-          log events from the master server until the SQL thread has
-          caught up and deleted some unused relay logs. Note that this
-          limit is not absolute: There are cases where the SQL thread
-          needs more events before it can delete relay logs. In that
-          case, the I/O thread exceeds the limit until it becomes
-          possible for the SQL thread to delete some relay logs. Not
-          doing so would cause a deadlock (which is what happens before
-          MySQL 4.0.13). You should not set
+          This option places an upper limit on the total size in bytes
+          of all relay logs on the slave. A value of 0 means <quote>no
+          limit.</quote> This is useful for a slave server host that has
+          limited disk space. When the limit is reached, the I/O thread
+          stops reading binary log events from the master server until
+          the SQL thread has caught up and deleted some unused relay
+          logs. Note that this limit is not absolute: There are cases
+          where the SQL thread needs more events before it can delete
+          relay logs. In that case, the I/O thread exceeds the limit
+          until it becomes possible for the SQL thread to delete some
+          relay logs, because not doing so would cause a deadlock (which
+          is what happens before MySQL 4.0.13). You should not set
           <option>--relay-log-space-limit</option> to less than twice
           the value of <option>--max-relay-log-size</option> (or
           <option>--max-binlog-size</option> if
@@ -2784,10 +2788,7 @@
           replicate cross-database statements such as <literal>UPDATE
           <replaceable>some_db.some_table</replaceable> SET
           foo='bar'</literal> while having selected a different database
-          or no database. If you need cross-database updates to work,
-          make sure that you have MySQL 3.23.28 or later, and use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          See <xref linkend="replication-rules"/>.
+          or no database.
         </para>
 
         <para>
@@ -2804,12 +2805,6 @@
 </programlisting>
 
         <para>
-          If you need cross-database updates to work, use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
-        </para>
-
-        <para>
           The main reason for this
           <quote>check-just-the-default-database</quote> behavior is
           that it's difficult from the statement alone to know whether
@@ -2819,6 +2814,13 @@
           databases). It is also faster to check only the default
           database rather than all databases if there is no need.
         </para>
+
+        <para>
+          If you need cross-database updates to work, make sure that you
+          have MySQL 3.23.28 or later, and use
+          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
+          instead. See <xref linkend="replication-rules"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -2869,7 +2871,7 @@
         <para>
           If you need cross-database updates to work, use
           <option>--replicate-wild-ignore-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
+          instead. See <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2880,8 +2882,8 @@
 
         <para>
           Tells the slave thread to not replicate any statement that
-          updates the specified table (even if any other tables might be
-          updated by the same statement). To specify more than one table
+          updates the specified table, even if any other tables might be
+          updated by the same statement. To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
           <option>--replicate-ignore-db</option>. See
@@ -2902,10 +2904,10 @@
           statements involving tables are affected (not statements such
           as <literal>CREATE DATABASE</literal>, <literal>DROP
           DATABASE</literal>, and <literal>ALTER DATABASE</literal>),
-          and only if <replaceable>from_name</replaceable> was the
+          and only if <replaceable>from_name</replaceable> is the
           default database on the master. This does not work for
-          cross-database updates. Note that the database name
-          translation is done before <option>--replicate-*</option>
+          cross-database updates. The database name translation is done
+          <emphasis>before</emphasis> the <option>--replicate-*</option>
           rules are tested.
         </para>
 
@@ -2926,11 +2928,11 @@
         </para>
 
         <para>
-          To be used on slave servers. Usually you can should the
-          default setting of 0, to prevent infinite loops in circular
-          replication. If set to 1, this slave does not skip events
-          having its own server id; normally this is useful only in rare
-          configurations. Cannot be set to 1 if
+          To be used on slave servers. Usually you should use the
+          default setting of 0, to prevent infinite loops caused by
+          circular replication. If set to 1, the slave does not skip
+          events having its own server ID. Normally, this is useful only
+          in rare configurations. Cannot be set to 1 if
           <option>--log-slave-updates</option> is used. Be careful that
           starting from MySQL 4.1, by default the slave I/O thread does
           not even write binary log events to the relay log if they have
@@ -2938,7 +2940,7 @@
           compared to 4.0). So if you want to use
           <option>--replicate-same-server-id</option> in 4.1 versions,
           be sure to start the slave with this option before you make
-          the slave read its own events which you want the slave SQL
+          the slave read its own events that you want the slave SQL
           thread to execute.
         </para>
       </listitem>
@@ -3002,7 +3004,7 @@
         </para>
 
         <para>
-          Tells the slave thread to not replicate a statement where any
+          Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
           each table. This works for cross-database updates. See
@@ -3039,9 +3041,8 @@
           register itself with the master. Note that it is not
           sufficient for the master to simply read the IP number of the
           slave from the TCP/IP socket after the slave connects. Due to
-          <literal>NAT</literal> and other routing issues, that IP may
-          not be valid for connecting to the slave from the master or
-          other hosts.
+          NAT and other routing issues, that IP may not be valid for
+          connecting to the slave from the master or other hosts.
         </para>
 
         <remark>
@@ -3056,15 +3057,15 @@
 
       <listitem>
         <para>
-          <option>--report-port=<replaceable>slave_port</replaceable></option>
+          <option>--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
         <para>
           The TCP/IP port number for connecting to the slave, to be
-          reported to the master during slave registration. Set it only
-          if the slave is listening on a non-default port or if you have
-          a special tunnel from the master or other clients to the
-          slave. If you are not sure, leave this option unset.
+          reported to the master during slave registration. Set this
+          only if the slave is listening on a non-default port or if you
+          have a special tunnel from the master or other clients to the
+          slave. If you are not sure, do not use this option.
         </para>
 
         <remark>
@@ -3090,6 +3091,10 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--slave_compressed_protocol={0|1}</option>
         </para>
@@ -3111,19 +3116,23 @@
           files. This option is by default equal to the value of the
           <literal>tmpdir</literal> system variable. When the slave SQL
           thread replicates a <literal>LOAD DATA INFILE</literal>
-          statement, it extracts the to-be-loaded file from the relay
-          log into temporary files, then loads these into the table. If
-          the file loaded on the master was huge, the temporary files on
-          the slave are huge, too. Therefore, it might be advisable to
-          use this option to tell the slave to put temporary files in a
-          directory located in some filesystem that has a lot of
-          available space. In that case, you may also use the
+          statement, it extracts the file to be loaded from the relay
+          log into temporary files, and then loads these into the table.
+          If the file loaded on the master is huge, the temporary files
+          on the slave are huge, too. Therefore, it might be advisable
+          to use this option to tell the slave to put temporary files in
+          a directory located in some filesystem that has a lot of
+          available space. In that case, the relay logs are huge as
+          well, so you might also want to use the
           <option>--relay-log</option> option to place the relay logs in
-          that filesystem, because the relay logs are huge as well.
-          <option>--slave-load-tmpdir</option> should point to a
-          disk-based filesystem, not a memory-based one: The slave needs
+          that filesystem.
+        </para>
+
+        <para>
+          The directory specified by this option should be located in a
+          disk-based filesystem (not a memory-based filesystem) because
           the temporary files used to replicate <literal>LOAD DATA
-          INFILE</literal> to survive a machine's restart. The directory
+          INFILE</literal> must survive machine restarts. The directory
           also should not be one that is cleared by the operating system
           during the system startup process.
         </para>
@@ -3136,25 +3145,25 @@
 
         <para>
           The number of seconds to wait for more data from the master
-          before aborting the read, considering the connection broken,
-          and trying to reconnect. The first retry occurs immediately
-          after the timeout. The interval between retries is controlled
-          by the <option>--master-connect-retry</option> option.
+          before the slave considers the connection broken, aborts the
+          read, and tries to reconnect. The first retry occurs
+          immediately after the timeout. The interval between retries is
+          controlled by the <option>--master-connect-retry</option>
+          option.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...
-          | all]</option>
+          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
         </para>
 
         <para>
-          Normally, replication stops when an error occurs, which gives
-          you the opportunity to resolve the inconsistency in the data
-          manually. This option tells the slave SQL thread to continue
-          replication when a statement returns any of the errors listed
-          in the option value.
+          Normally, replication stops when an error occurs on the slave.
+          This gives you the opportunity to resolve the inconsistency in
+          the data manually. This option tells the slave SQL thread to
+          continue replication when a statement returns any of the
+          errors listed in the option value.
         </para>
 
         <para>
@@ -3170,19 +3179,19 @@
         <para>
           For error codes, you should use the numbers provided by the
           error message in your slave error log and in the output of
-          <literal>SHOW SLAVE STATUS</literal>. The server error codes
-          are listed in <xref linkend="error-handling"/>.
+          <literal>SHOW SLAVE STATUS</literal>.
+          <xref linkend="error-handling"/>, lists server error codes.
         </para>
 
         <para>
           You can also (but should not) use the very non-recommended
-          value of <literal>all</literal> which ignores all error
-          messages and keeps going regardless of what happens. Needless
-          to say, if you use it, we make no guarantees regarding
-          integrity the integrity of your data. Please do not complain
-          (or file bug reports) in this case if the slave's data is not
-          anywhere close to what it is on the master. <emphasis>You have
-          been warned</emphasis>.
+          value of <literal>all</literal> to cause the slave to ignore
+          all error messages and keeps going regardless of what happens.
+          Needless to say, if you use <literal>all</literal>, there are
+          no guarantees regarding the integrity of your data. Please do
+          not complain (or file bug reports) in this case if the slave's
+          data is not anywhere close to what it is on the master.
+          <emphasis>You have been warned</emphasis>.
         </para>
 
         <para>
@@ -3210,7 +3219,7 @@
 
     <para>
       The slave server evaluates the <option>--replicate-*</option>
-      rules as follows to determine whether to execute or ignore a
+      options as follows to determine whether to execute or ignore a
       statement:
     </para>
 
@@ -3226,11 +3235,11 @@
 
           <listitem>
             <para>
-              <emphasis>Yes</emphasis>: Test them as for
-              <option>--binlog-do-db</option> and
-              <option>--binlog-ignore-db</option> (see
-              <xref linkend="binary-log"/>). What is the result of the
-              test?
+              <emphasis>Yes</emphasis>: Test them using the same rules
+              as for <option>--binlog-do-db</option> and
+              <option>--binlog-ignore-db</option>. (For a description of
+              these rules, see <xref linkend="binary-log"/>.) What is
+              the result of the test?
             </para>
 
             <itemizedlist>
@@ -3279,15 +3288,16 @@
               <emphasis>Yes</emphasis>: Proceed to the next step and
               begin evaluating the table rules in the order shown (first
               the non-wild rules, and then the wild rules). Only tables
-              that are to be updated are compared to the rules
-              (<literal>INSERT INTO sales SELECT * FROM
-              prices</literal>: only <literal>sales</literal> is
-              compared to the rules). If several tables are to be
-              updated (multiple-table statement), the first matching
-              table (matching <quote>do</quote> or
-              <quote>ignore</quote>) wins. That is, the first table is
-              compared to the rules. Then, if no decision could be made,
-              the second table is compared to the rules, and so on.
+              that are to be updated are compared to the rules. For
+              example, if the statement is <literal>INSERT INTO sales
+              SELECT * FROM prices</literal>, only
+              <literal>sales</literal> is compared to the rules). If
+              several tables are to be updated (multiple-table
+              statement), the first table that matches <quote>do</quote>
+              or <quote>ignore</quote> wins. That is, the server checks
+              the first table against the rules. If no decision could be
+              made, it checks the second table against the rules, and so
+              on.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-30 02:01:41 UTC (rev 1114)
+++ trunk/refman-5.0/replication.xml	2006-01-30 02:01:55 UTC (rev 1115)
@@ -2610,30 +2610,35 @@
           Disable or enable automatic purging of relay logs as soon as
           they are not needed any more. The default value is 1
           (enabled). This is a global variable that can be changed
-          dynamically with <literal>SET GLOBAL
-          relay_log_purge</literal>.
+          dynamically with <literal>SET GLOBAL relay_log_purge =
+          <replaceable>N</replaceable></literal>.
         </para>
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
         <para>
-          Place an upper limit on the total size of all relay logs on
-          the slave (a value of 0 means <quote>unlimited</quote>). This
-          is useful for a slave server host that has limited disk space.
-          When the limit is reached, the I/O thread stops reading binary
-          log events from the master server until the SQL thread has
-          caught up and deleted some unused relay logs. Note that this
-          limit is not absolute: There are cases where the SQL thread
-          needs more events before it can delete relay logs. In that
-          case, the I/O thread exceeds the limit until it becomes
-          possible for the SQL thread to delete some relay logs. (Not
-          doing so would cause a deadlock.) You should not set
-          <option>--relay-log-space-limit</option> to less than twice
-          the value of <option>--max-relay-log-size</option> (or
+          This option places an upper limit on the total size in bytes
+          of all relay logs on the slave. A value of 0 means <quote>no
+          limit.</quote> This is useful for a slave server host that has
+          limited disk space. When the limit is reached, the I/O thread
+          stops reading binary log events from the master server until
+          the SQL thread has caught up and deleted some unused relay
+          logs. Note that this limit is not absolute: There are cases
+          where the SQL thread needs more events before it can delete
+          relay logs. In that case, the I/O thread exceeds the limit
+          until it becomes possible for the SQL thread to delete some
+          relay logs, because not doing so would cause a deadlock. You
+          should not set <option>--relay-log-space-limit</option> to
+          less than twice the value of
+          <option>--max-relay-log-size</option> (or
           <option>--max-binlog-size</option> if
           <option>--max-relay-log-size</option> is 0). In that case,
           there is a chance that the I/O thread waits for free space
@@ -2658,10 +2663,7 @@
           replicate cross-database statements such as <literal>UPDATE
           <replaceable>some_db.some_table</replaceable> SET
           foo='bar'</literal> while having selected a different database
-          or no database. If you need cross-database updates to work,
-          use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          See <xref linkend="replication-rules"/>.
+          or no database.
         </para>
 
         <para>
@@ -2678,12 +2680,6 @@
 </programlisting>
 
         <para>
-          If you need cross-database updates to work, use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
-        </para>
-
-        <para>
           The main reason for this <quote>just check the default
           database</quote> behavior is that it is difficult from the
           statement alone to know whether it should be replicated (for
@@ -2693,6 +2689,12 @@
           databases). It is also faster to check only the default
           database rather than all databases if there is no need.
         </para>
+
+        <para>
+          If you need cross-database updates to work, use
+          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
+          instead. See <xref linkend="replication-rules"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -2743,7 +2745,7 @@
         <para>
           If you need cross-database updates to work, use
           <option>--replicate-wild-ignore-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
+          instead. See <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2754,8 +2756,8 @@
 
         <para>
           Tells the slave thread to not replicate any statement that
-          updates the specified table (even if any other tables might be
-          updated by the same statement). To specify more than one table
+          updates the specified table, even if any other tables might be
+          updated by the same statement. To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
           <option>--replicate-ignore-db</option>. See
@@ -2776,10 +2778,10 @@
           statements involving tables are affected (not statements such
           as <literal>CREATE DATABASE</literal>, <literal>DROP
           DATABASE</literal>, and <literal>ALTER DATABASE</literal>),
-          and only if <replaceable>from_name</replaceable> was the
+          and only if <replaceable>from_name</replaceable> is the
           default database on the master. This does not work for
-          cross-database updates. Note that the database name
-          translation is done before <option>--replicate-*</option>
+          cross-database updates. The database name translation is done
+          <emphasis>before</emphasis> the <option>--replicate-*</option>
           rules are tested.
         </para>
 
@@ -2800,18 +2802,18 @@
         </para>
 
         <para>
-          To be used on slave servers. Usually you can should the
-          default setting of 0, to prevent infinite loops in circular
-          replication. If set to 1, this slave does not skip events
-          having its own server id; normally this is useful only in rare
-          configurations. Cannot be set to 1 if
+          To be used on slave servers. Usually you should use the
+          default setting of 0, to prevent infinite loops caused by
+          circular replication. If set to 1, the slave does not skip
+          events having its own server ID. Normally, this is useful only
+          in rare configurations. Cannot be set to 1 if
           <option>--log-slave-updates</option> is used. Note that by
           default the slave I/O thread does not even write binary log
           events to the relay log if they have the slave's server id
           (this optimization helps save disk usage). So if you want to
           use <option>--replicate-same-server-id</option>, be sure to
           start the slave with this option before you make the slave
-          read its own events which you want the slave SQL thread to
+          read its own events that you want the slave SQL thread to
           execute.
         </para>
       </listitem>
@@ -2875,7 +2877,7 @@
         </para>
 
         <para>
-          Tells the slave thread to not replicate a statement where any
+          Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
           each table. This works for cross-database updates. See
@@ -2912,9 +2914,8 @@
           register itself with the master. Note that it is not
           sufficient for the master to simply read the IP number of the
           slave from the TCP/IP socket after the slave connects. Due to
-          <literal>NAT</literal> and other routing issues, that IP may
-          not be valid for connecting to the slave from the master or
-          other hosts.
+          NAT and other routing issues, that IP may not be valid for
+          connecting to the slave from the master or other hosts.
         </para>
       </listitem>
 
@@ -2925,15 +2926,15 @@
         </remark>
 
         <para>
-          <option>--report-port=<replaceable>slave_port</replaceable></option>
+          <option>--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
         <para>
           The TCP/IP port number for connecting to the slave, to be
-          reported to the master during slave registration. Set it only
-          if the slave is listening on a non-default port or if you have
-          a special tunnel from the master or other clients to the
-          slave. If you are not sure, leave this option unset.
+          reported to the master during slave registration. Set this
+          only if the slave is listening on a non-default port or if you
+          have a special tunnel from the master or other clients to the
+          slave. If you are not sure, do not use this option.
         </para>
       </listitem>
 
@@ -2955,6 +2956,10 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--slave_compressed_protocol={0|1}</option>
         </para>
@@ -2976,19 +2981,23 @@
           files. This option is by default equal to the value of the
           <literal>tmpdir</literal> system variable. When the slave SQL
           thread replicates a <literal>LOAD DATA INFILE</literal>
-          statement, it extracts the to-be-loaded file from the relay
-          log into temporary files, then loads these into the table. If
-          the file loaded on the master was huge, the temporary files on
-          the slave are huge, too. Therefore, it might be advisable to
-          use this option to tell the slave to put temporary files in a
-          directory located in some filesystem that has a lot of
-          available space. In that case, you may also use the
+          statement, it extracts the file to be loaded from the relay
+          log into temporary files, and then loads these into the table.
+          If the file loaded on the master is huge, the temporary files
+          on the slave are huge, too. Therefore, it might be advisable
+          to use this option to tell the slave to put temporary files in
+          a directory located in some filesystem that has a lot of
+          available space. In that case, the relay logs are huge as
+          well, so you might also want to use the
           <option>--relay-log</option> option to place the relay logs in
-          that filesystem, because the relay logs are huge as well.
-          <option>--slave-load-tmpdir</option> should point to a
-          disk-based filesystem, not a memory-based one: The slave needs
+          that filesystem.
+        </para>
+
+        <para>
+          The directory specified by this option should be located in a
+          disk-based filesystem (not a memory-based filesystem) because
           the temporary files used to replicate <literal>LOAD DATA
-          INFILE</literal> to survive a machine's restart. The directory
+          INFILE</literal> must survive machine restarts. The directory
           also should not be one that is cleared by the operating system
           during the system startup process.
         </para>
@@ -3001,25 +3010,25 @@
 
         <para>
           The number of seconds to wait for more data from the master
-          before aborting the read, considering the connection broken,
-          and trying to reconnect. The first retry occurs immediately
-          after the timeout. The interval between retries is controlled
-          by the <option>--master-connect-retry</option> option.
+          before the slave considers the connection broken, aborts the
+          read, and tries to reconnect. The first retry occurs
+          immediately after the timeout. The interval between retries is
+          controlled by the <option>--master-connect-retry</option>
+          option.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...
-          | all]</option>
+          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
         </para>
 
         <para>
-          Normally, replication stops when an error occurs, which gives
-          you the opportunity to resolve the inconsistency in the data
-          manually. This option tells the slave SQL thread to continue
-          replication when a statement returns any of the errors listed
-          in the option value.
+          Normally, replication stops when an error occurs on the slave.
+          This gives you the opportunity to resolve the inconsistency in
+          the data manually. This option tells the slave SQL thread to
+          continue replication when a statement returns any of the
+          errors listed in the option value.
         </para>
 
         <para>
@@ -3035,19 +3044,19 @@
         <para>
           For error codes, you should use the numbers provided by the
           error message in your slave error log and in the output of
-          <literal>SHOW SLAVE STATUS</literal>. The server error codes
-          are listed in <xref linkend="error-handling"/>.
+          <literal>SHOW SLAVE STATUS</literal>.
+          <xref linkend="error-handling"/>, lists server error codes.
         </para>
 
         <para>
           You can also (but should not) use the very non-recommended
-          value of <literal>all</literal> which ignores all error
-          messages and keeps going regardless of what happens. Needless
-          to say, if you use it, we make no guarantees regarding
-          integrity the integrity of your data. Please do not complain
-          (or file bug reports) in this case if the slave's data is not
-          anywhere close to what it is on the master. <emphasis>You have
-          been warned</emphasis>.
+          value of <literal>all</literal> to cause the slave to ignore
+          all error messages and keeps going regardless of what happens.
+          Needless to say, if you use <literal>all</literal>, there are
+          no guarantees regarding the integrity of your data. Please do
+          not complain (or file bug reports) in this case if the slave's
+          data is not anywhere close to what it is on the master.
+          <emphasis>You have been warned</emphasis>.
         </para>
 
         <para>
@@ -3075,7 +3084,7 @@
 
     <para>
       The slave server evaluates the <option>--replicate-*</option>
-      rules as follows to determine whether to execute or ignore a
+      options as follows to determine whether to execute or ignore a
       statement:
     </para>
 
@@ -3091,11 +3100,11 @@
 
           <listitem>
             <para>
-              <emphasis>Yes</emphasis>: Test them as for
-              <option>--binlog-do-db</option> and
-              <option>--binlog-ignore-db</option> (see
-              <xref linkend="binary-log"/>). What is the result of the
-              test?
+              <emphasis>Yes</emphasis>: Test them using the same rules
+              as for <option>--binlog-do-db</option> and
+              <option>--binlog-ignore-db</option>. (For a description of
+              these rules, see <xref linkend="binary-log"/>.) What is
+              the result of the test?
             </para>
 
             <itemizedlist>
@@ -3174,15 +3183,16 @@
               <emphasis>Yes</emphasis>: Proceed to the next step and
               begin evaluating the table rules in the order shown (first
               the non-wild rules, and then the wild rules). Only tables
-              that are to be updated are compared to the rules
-              (<literal>INSERT INTO sales SELECT * FROM
-              prices</literal>: only <literal>sales</literal> is
-              compared to the rules). If several tables are to be
-              updated (multiple-table statement), the first matching
-              table (matching <quote>do</quote> or
-              <quote>ignore</quote>) wins. That is, the first table is
-              compared to the rules. Then, if no decision could be made,
-              the second table is compared to the rules, and so on.
+              that are to be updated are compared to the rules. For
+              example, if the statement is <literal>INSERT INTO sales
+              SELECT * FROM prices</literal>, only
+              <literal>sales</literal> is compared to the rules). If
+              several tables are to be updated (multiple-table
+              statement), the first table that matches <quote>do</quote>
+              or <quote>ignore</quote> wins. That is, the server checks
+              the first table against the rules. If no decision could be
+              made, it checks the second table against the rules, and so
+              on.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-30 02:01:41 UTC (rev 1114)
+++ trunk/refman-5.1/replication.xml	2006-01-30 02:01:55 UTC (rev 1115)
@@ -2294,9 +2294,9 @@
     </remark>
 
     <para>
-      This section describes the options that you can use on
-      slave replication servers. You can specify these
-      options either on the command line or in an option file.
+      This section describes the options that you can use on slave
+      replication servers. You can specify these options either on the
+      command line or in an option file.
     </para>
 
     <para>
@@ -2750,30 +2750,35 @@
           Disable or enable automatic purging of relay logs as soon as
           they are not needed any more. The default value is 1
           (enabled). This is a global variable that can be changed
-          dynamically with <literal>SET GLOBAL
-          relay_log_purge</literal>.
+          dynamically with <literal>SET GLOBAL relay_log_purge =
+          <replaceable>N</replaceable></literal>.
         </para>
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
         <para>
-          Place an upper limit on the total size of all relay logs on
-          the slave (a value of 0 means <quote>unlimited</quote>). This
-          is useful for a slave server host that has limited disk space.
-          When the limit is reached, the I/O thread stops reading binary
-          log events from the master server until the SQL thread has
-          caught up and deleted some unused relay logs. Note that this
-          limit is not absolute: There are cases where the SQL thread
-          needs more events before it can delete relay logs. In that
-          case, the I/O thread exceeds the limit until it becomes
-          possible for the SQL thread to delete some relay logs. (Not
-          doing so would cause a deadlock.) You should not set
-          <option>--relay-log-space-limit</option> to less than twice
-          the value of <option>--max-relay-log-size</option> (or
+          This option places an upper limit on the total size in bytes
+          of all relay logs on the slave. A value of 0 means <quote>no
+          limit.</quote> This is useful for a slave server host that has
+          limited disk space. When the limit is reached, the I/O thread
+          stops reading binary log events from the master server until
+          the SQL thread has caught up and deleted some unused relay
+          logs. Note that this limit is not absolute: There are cases
+          where the SQL thread needs more events before it can delete
+          relay logs. In that case, the I/O thread exceeds the limit
+          until it becomes possible for the SQL thread to delete some
+          relay logs, because not doing so would cause a deadlock. You
+          should not set <option>--relay-log-space-limit</option> to
+          less than twice the value of
+          <option>--max-relay-log-size</option> (or
           <option>--max-binlog-size</option> if
           <option>--max-relay-log-size</option> is 0). In that case,
           there is a chance that the I/O thread waits for free space
@@ -2798,10 +2803,7 @@
           replicate cross-database statements such as <literal>UPDATE
           <replaceable>some_db.some_table</replaceable> SET
           foo='bar'</literal> while having selected a different database
-          or no database. If you need cross-database updates to work,
-          use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          See <xref linkend="replication-rules"/>.
+          or no database.
         </para>
 
         <para>
@@ -2818,12 +2820,6 @@
 </programlisting>
 
         <para>
-          If you need cross-database updates to work, use
-          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
-        </para>
-
-        <para>
           The main reason for this <quote>just check the default
           database</quote> behavior is that it is difficult from the
           statement alone to know whether it should be replicated (for
@@ -2833,6 +2829,12 @@
           databases). It is also faster to check only the default
           database rather than all databases if there is no need.
         </para>
+
+        <para>
+          If you need cross-database updates to work, use
+          <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>
+          instead. See <xref linkend="replication-rules"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -2883,7 +2885,7 @@
         <para>
           If you need cross-database updates to work, use
           <option>--replicate-wild-ignore-table=<replaceable>db_name</replaceable>.%</option>
-          instead.
+          instead. See <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2894,8 +2896,8 @@
 
         <para>
           Tells the slave thread to not replicate any statement that
-          updates the specified table (even if any other tables might be
-          updated by the same statement). To specify more than one table
+          updates the specified table, even if any other tables might be
+          updated by the same statement. To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
           <option>--replicate-ignore-db</option>. See
@@ -2916,10 +2918,10 @@
           statements involving tables are affected (not statements such
           as <literal>CREATE DATABASE</literal>, <literal>DROP
           DATABASE</literal>, and <literal>ALTER DATABASE</literal>),
-          and only if <replaceable>from_name</replaceable> was the
+          and only if <replaceable>from_name</replaceable> is the
           default database on the master. This does not work for
-          cross-database updates. Note that the database name
-          translation is done before <option>--replicate-*</option>
+          cross-database updates. The database name translation is done
+          <emphasis>before</emphasis> the <option>--replicate-*</option>
           rules are tested.
         </para>
 
@@ -2940,18 +2942,18 @@
         </para>
 
         <para>
-          To be used on slave servers. Usually you can should the
-          default setting of 0, to prevent infinite loops in circular
-          replication. If set to 1, this slave does not skip events
-          having its own server id; normally this is useful only in rare
-          configurations. Cannot be set to 1 if
+          To be used on slave servers. Usually you should use the
+          default setting of 0, to prevent infinite loops caused by
+          circular replication. If set to 1, the slave does not skip
+          events having its own server ID. Normally, this is useful only
+          in rare configurations. Cannot be set to 1 if
           <option>--log-slave-updates</option> is used. Note that by
           default the slave I/O thread does not even write binary log
           events to the relay log if they have the slave's server id
           (this optimization helps save disk usage). So if you want to
           use <option>--replicate-same-server-id</option>, be sure to
           start the slave with this option before you make the slave
-          read its own events which you want the slave SQL thread to
+          read its own events that you want the slave SQL thread to
           execute.
         </para>
       </listitem>
@@ -3015,7 +3017,7 @@
         </para>
 
         <para>
-          Tells the slave thread to not replicate a statement where any
+          Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
           each table. This works for cross-database updates. See
@@ -3052,9 +3054,8 @@
           register itself with the master. Note that it is not
           sufficient for the master to simply read the IP number of the
           slave from the TCP/IP socket after the slave connects. Due to
-          <literal>NAT</literal> and other routing issues, that IP may
-          not be valid for connecting to the slave from the master or
-          other hosts.
+          NAT and other routing issues, that IP may not be valid for
+          connecting to the slave from the master or other hosts.
         </para>
       </listitem>
 
@@ -3065,15 +3066,15 @@
         </remark>
 
         <para>
-          <option>--report-port=<replaceable>slave_port</replaceable></option>
+          <option>--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
         <para>
           The TCP/IP port number for connecting to the slave, to be
-          reported to the master during slave registration. Set it only
-          if the slave is listening on a non-default port or if you have
-          a special tunnel from the master or other clients to the
-          slave. If you are not sure, leave this option unset.
+          reported to the master during slave registration. Set this
+          only if the slave is listening on a non-default port or if you
+          have a special tunnel from the master or other clients to the
+          slave. If you are not sure, do not use this option.
         </para>
       </listitem>
 
@@ -3095,6 +3096,10 @@
       </listitem>
 
       <listitem>
+        <remark role="todo">
+          [pd]This is really a system variable, not an option.
+        </remark>
+
         <para>
           <option>--slave_compressed_protocol={0|1}</option>
         </para>
@@ -3116,19 +3121,23 @@
           files. This option is by default equal to the value of the
           <literal>tmpdir</literal> system variable. When the slave SQL
           thread replicates a <literal>LOAD DATA INFILE</literal>
-          statement, it extracts the to-be-loaded file from the relay
-          log into temporary files, then loads these into the table. If
-          the file loaded on the master was huge, the temporary files on
-          the slave are huge, too. Therefore, it might be advisable to
-          use this option to tell the slave to put temporary files in a
-          directory located in some filesystem that has a lot of
-          available space. In that case, you may also use the
+          statement, it extracts the file to be loaded from the relay
+          log into temporary files, and then loads these into the table.
+          If the file loaded on the master is huge, the temporary files
+          on the slave are huge, too. Therefore, it might be advisable
+          to use this option to tell the slave to put temporary files in
+          a directory located in some filesystem that has a lot of
+          available space. In that case, the relay logs are huge as
+          well, so you might also want to use the
           <option>--relay-log</option> option to place the relay logs in
-          that filesystem, because the relay logs are huge as well.
-          <option>--slave-load-tmpdir</option> should point to a
-          disk-based filesystem, not a memory-based one: The slave needs
+          that filesystem.
+        </para>
+
+        <para>
+          The directory specified by this option should be located in a
+          disk-based filesystem (not a memory-based filesystem) because
           the temporary files used to replicate <literal>LOAD DATA
-          INFILE</literal> to survive a machine's restart. The directory
+          INFILE</literal> must survive machine restarts. The directory
           also should not be one that is cleared by the operating system
           during the system startup process.
         </para>
@@ -3141,25 +3150,25 @@
 
         <para>
           The number of seconds to wait for more data from the master
-          before aborting the read, considering the connection broken,
-          and trying to reconnect. The first retry occurs immediately
-          after the timeout. The interval between retries is controlled
-          by the <option>--master-connect-retry</option> option.
+          before the slave considers the connection broken, aborts the
+          read, and tries to reconnect. The first retry occurs
+          immediately after the timeout. The interval between retries is
+          controlled by the <option>--master-connect-retry</option>
+          option.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...
-          | all]</option>
+          <option>--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
         </para>
 
         <para>
-          Normally, replication stops when an error occurs, which gives
-          you the opportunity to resolve the inconsistency in the data
-          manually. This option tells the slave SQL thread to continue
-          replication when a statement returns any of the errors listed
-          in the option value.
+          Normally, replication stops when an error occurs on the slave.
+          This gives you the opportunity to resolve the inconsistency in
+          the data manually. This option tells the slave SQL thread to
+          continue replication when a statement returns any of the
+          errors listed in the option value.
         </para>
 
         <para>
@@ -3175,19 +3184,19 @@
         <para>
           For error codes, you should use the numbers provided by the
           error message in your slave error log and in the output of
-          <literal>SHOW SLAVE STATUS</literal>. The server error codes
-          are listed in <xref linkend="error-handling"/>.
+          <literal>SHOW SLAVE STATUS</literal>.
+          <xref linkend="error-handling"/>, lists server error codes.
         </para>
 
         <para>
           You can also (but should not) use the very non-recommended
-          value of <literal>all</literal> which ignores all error
-          messages and keeps going regardless of what happens. Needless
-          to say, if you use it, we make no guarantees regarding
-          integrity the integrity of your data. Please do not complain
-          (or file bug reports) in this case if the slave's data is not
-          anywhere close to what it is on the master. <emphasis>You have
-          been warned</emphasis>.
+          value of <literal>all</literal> to cause the slave to ignore
+          all error messages and keeps going regardless of what happens.
+          Needless to say, if you use <literal>all</literal>, there are
+          no guarantees regarding the integrity of your data. Please do
+          not complain (or file bug reports) in this case if the slave's
+          data is not anywhere close to what it is on the master.
+          <emphasis>You have been warned</emphasis>.
         </para>
 
         <para>
@@ -3215,7 +3224,7 @@
 
     <para>
       The slave server evaluates the <option>--replicate-*</option>
-      rules as follows to determine whether to execute or ignore a
+      options as follows to determine whether to execute or ignore a
       statement:
     </para>
 
@@ -3231,11 +3240,11 @@
 
           <listitem>
             <para>
-              <emphasis>Yes</emphasis>: Test them as for
-              <option>--binlog-do-db</option> and
-              <option>--binlog-ignore-db</option> (see
-              <xref linkend="binary-log"/>). What is the result of the
-              test?
+              <emphasis>Yes</emphasis>: Test them using the same rules
+              as for <option>--binlog-do-db</option> and
+              <option>--binlog-ignore-db</option>. (For a description of
+              these rules, see <xref linkend="binary-log"/>.) What is
+              the result of the test?
             </para>
 
             <itemizedlist>
@@ -3303,7 +3312,7 @@
 
           <listitem>
             <para>
-              <emphasis>Yes</emphasis>: In this case, the behaviour
+              <emphasis>Yes</emphasis>: In this case, the behavior
               depends on whether statement-based replication or
               row-based replication are enabled:
 
@@ -3315,16 +3324,16 @@
                     Proceed to the next step and begin evaluating the
                     table rules in the order shown (first the non-wild
                     rules, and then the wild rules). Only tables that
-                    are to be updated are compared to the rules
-                    (<literal>INSERT INTO sales SELECT * FROM
-                    prices</literal>: only <literal>sales</literal> is
-                    compared to the rules). If several tables are to be
-                    updated (multiple-table statement), the first
-                    matching table (matching <quote>do</quote> or
-                    <quote>ignore</quote>) wins. That is, the first
-                    table is compared to the rules. Then, if no decision
-                    could be made, the second table is compared to the
-                    rules, and so on.
+                    are to be updated are compared to the rules. For
+                    example, if the statement is <literal>INSERT INTO
+                    sales SELECT * FROM prices</literal>, only
+                    <literal>sales</literal> is compared to the rules).
+                    If several tables are to be updated (multiple-table
+                    statement), the first table that matches
+                    <quote>do</quote> or <quote>ignore</quote> wins.
+                    That is, the server checks the first table against
+                    the rules. If no decision could be made, it checks
+                    the second table against the rules, and so on.
                   </para>
                 </listitem>
 
@@ -3332,10 +3341,10 @@
                   <para>
                     <emphasis>Row-based replication</emphasis>: All
                     table row changes are filtered individually. For
-                    multi-table updates, each table is filtered
-                    separately according to the rules. Some may be
-                    changed and some not, depending on the rules (and
-                    the actual changes, of course).
+                    multiple-table updates, each table is filtered
+                    separately according to the rules. Some updates may
+                    be executed and some not, depending on the rules and
+                    the changes to be made.
                   </para>
                 </listitem>
 

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