List:Commits« Previous MessageNext Message »
From:paul Date:January 29 2006 9:31pm
Subject:svn commit - mysqldoc@docsrva: r1106 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-29 22:31:32 +0100 (Sun, 29 Jan 2006)
New Revision: 1106

Log:
 r6866@frost:  paul | 2006-01-29 14:26:29 -0600
 Move out-of-order options.


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:6862
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6866
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-29 19:08:40 UTC (rev 1105)
+++ trunk/refman-4.1/replication.xml	2006-01-29 21:31:32 UTC (rev 1106)
@@ -2838,6 +2838,60 @@
 
       <listitem>
         <para>
+          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
+        </para>
+
+        <para>
+          Tells the slave to translate the default database (that is,
+          the one selected by <literal>USE</literal>) to
+          <replaceable>to_name</replaceable> if it was
+          <replaceable>from_name</replaceable> on the master. Only
+          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
+          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>
+          rules are tested.
+        </para>
+
+        <para>
+          If you use this option on the command line and the
+          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
+          your command interpreter, quote the option value. For example:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
+</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--replicate-same-server-id</option>
+        </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
+          <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
+          the slave's server id (this optimization helps save disk usage
+          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
+          thread to execute.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <option>--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
@@ -2921,60 +2975,6 @@
 
       <listitem>
         <para>
-          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
-        </para>
-
-        <para>
-          Tells the slave to translate the default database (that is,
-          the one selected by <literal>USE</literal>) to
-          <replaceable>to_name</replaceable> if it was
-          <replaceable>from_name</replaceable> on the master. Only
-          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
-          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>
-          rules are tested.
-        </para>
-
-        <para>
-          If you use this option on the command line and the
-          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
-          your command interpreter, quote the option value. For example:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>
-          <option>--replicate-same-server-id</option>
-        </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
-          <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
-          the slave's server id (this optimization helps save disk usage
-          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
-          thread to execute.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
           <option>--report-host=<replaceable>slave_name</replaceable></option>
         </para>
 

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-29 19:08:40 UTC (rev 1105)
+++ trunk/refman-5.0/replication.xml	2006-01-29 21:31:32 UTC (rev 1106)
@@ -2713,6 +2713,59 @@
 
       <listitem>
         <para>
+          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
+        </para>
+
+        <para>
+          Tells the slave to translate the default database (that is,
+          the one selected by <literal>USE</literal>) to
+          <replaceable>to_name</replaceable> if it was
+          <replaceable>from_name</replaceable> on the master. Only
+          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
+          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>
+          rules are tested.
+        </para>
+
+        <para>
+          If you use this option on the command line and the
+          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
+          your command interpreter, quote the option value. For example:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
+</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--replicate-same-server-id</option>
+        </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
+          <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
+          execute.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <option>--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
@@ -2796,59 +2849,6 @@
 
       <listitem>
         <para>
-          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
-        </para>
-
-        <para>
-          Tells the slave to translate the default database (that is,
-          the one selected by <literal>USE</literal>) to
-          <replaceable>to_name</replaceable> if it was
-          <replaceable>from_name</replaceable> on the master. Only
-          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
-          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>
-          rules are tested.
-        </para>
-
-        <para>
-          If you use this option on the command line and the
-          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
-          your command interpreter, quote the option value. For example:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>
-          <option>--replicate-same-server-id</option>
-        </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
-          <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
-          execute.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
           <option>--report-host=<replaceable>slave_name</replaceable></option>
         </para>
 

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-29 19:08:40 UTC (rev 1105)
+++ trunk/refman-5.1/replication.xml	2006-01-29 21:31:32 UTC (rev 1106)
@@ -2878,6 +2878,59 @@
 
       <listitem>
         <para>
+          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
+        </para>
+
+        <para>
+          Tells the slave to translate the default database (that is,
+          the one selected by <literal>USE</literal>) to
+          <replaceable>to_name</replaceable> if it was
+          <replaceable>from_name</replaceable> on the master. Only
+          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
+          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>
+          rules are tested.
+        </para>
+
+        <para>
+          If you use this option on the command line and the
+          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
+          your command interpreter, quote the option value. For example:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
+</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>
+          <option>--replicate-same-server-id</option>
+        </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
+          <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
+          execute.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <option>--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
@@ -2961,59 +3014,6 @@
 
       <listitem>
         <para>
-          <option>--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
-        </para>
-
-        <para>
-          Tells the slave to translate the default database (that is,
-          the one selected by <literal>USE</literal>) to
-          <replaceable>to_name</replaceable> if it was
-          <replaceable>from_name</replaceable> on the master. Only
-          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
-          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>
-          rules are tested.
-        </para>
-
-        <para>
-          If you use this option on the command line and the
-          &lsquo;<literal>&gt;</literal>&rsquo; character is special to
-          your command interpreter, quote the option value. For example:
-        </para>
-
-<programlisting>
-shell&gt; <userinput>mysqld --replicate-rewrite-db="<replaceable>olddb</replaceable>-&gt;<replaceable>newdb</replaceable>"</userinput>
-</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>
-          <option>--replicate-same-server-id</option>
-        </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
-          <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
-          execute.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
           <option>--report-host=<replaceable>slave_name</replaceable></option>
         </para>
 

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