Author: paul
Date: 2009-11-07 18:41:41 +0100 (Sat, 07 Nov 2009)
New Revision: 17515
Log:
r46243@frost: paul | 2009-11-07 11:23:08 -0500
General revisions
Modified:
trunk/refman-5.0/replication-solutions.xml
trunk/refman-5.1/replication-solutions.xml
trunk/refman-5.4/replication-solutions.xml
trunk/refman-5.5/replication-solutions.xml
trunk/refman-6.0.sav/replication-solutions.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27680
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:46237
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27680
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:46243
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-5.0/replication-solutions.xml
===================================================================
--- trunk/refman-5.0/replication-solutions.xml 2009-11-07 17:40:36 UTC (rev 17514)
+++ trunk/refman-5.0/replication-solutions.xml 2009-11-07 17:41:41 UTC (rev 17515)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4109 bytes
@@ -53,8 +53,8 @@
<para>
To secure your replication communication you can encrypt the
- communication channel by using SSL to exchange data. Step-by-step
- instructions can be found in
+ communication channel by using SSL to exchange data. For
+ step-by-step instructions, see
<xref linkend="replication-solutions-ssl"/>.
</para>
@@ -63,19 +63,19 @@
<title>Using Replication for Backups</title>
<para>
- You can use replication as a backup solution by replicating data
- from the master to a slave, and then backing up the data slave.
- The slave can be paused and shut down without affecting the
- running operation of the master, so you can produce an effective
- snapshot of <quote>live</quote> data that would otherwise require
- a shutdown of the master database.
+ To use replication as a backup solution, replicate data from the
+ master to a slave, and then back up the data slave. The slave can
+ be paused and shut down without affecting the running operation of
+ the master, so you can produce an effective snapshot of
+ <quote>live</quote> data that would otherwise require a shutdown
+ of the master database.
</para>
<para>
- How you back up the database will depend on the size of the
- database and whether you are backing up only the data, or the data
- and the replication slave state so that you can rebuild the slave
- in the event of failure. There are therefore two choices:
+ How you back up the database depends on the size of the database
+ and whether you are backing up only the data, or the data and the
+ replication slave state so that you can rebuild the slave in the
+ event of failure. There are therefore two choices:
</para>
<para>
@@ -111,17 +111,18 @@
</para>
<para>
- When using <command>mysqldump</command>, you should stop the
- slave before starting the dump process to ensure that the dump
- contains a consistent set of data:
+ When using <command>mysqldump</command>, you should stop
+ replication on the slave before starting the dump process to
+ ensure that the dump contains a consistent set of data:
</para>
<orderedlist>
<listitem>
<para>
- Stop the slave from processing requests. You can stop the
- slave completely using <command>mysqladmin</command>:
+ Stop the slave from processing requests. You can stop
+ replication completely on the slave using
+ <command>mysqladmin</command>:
</para>
<programlisting>shell> <userinput>mysqladmin stop-slave</userinput></programlisting>
@@ -165,7 +166,7 @@
</orderedlist>
<para>
- In the preceding example you may want to add login credentials
+ In the preceding example, you may want to add login credentials
(user name, password) to the commands, and bundle the process up
into a script that you can run automatically each day.
</para>
@@ -173,7 +174,7 @@
<para>
If you use this approach, make sure you monitor the slave
replication process to ensure that the time taken to run the
- backup is not affecting the slave's ability to keep up with
+ backup does not affect the slave's ability to keep up with
events from the master. See
<xref linkend="replication-administration-status"/>. If the
slave is unable to keep up, you may want to add another slave
@@ -231,8 +232,7 @@
<listitem>
<para>
- Start the <command>mysqld</command> process again. Under
- Unix:
+ Start the MySQL server again. Under Unix:
</para>
<programlisting>shell> <userinput>mysqld_safe &</userinput></programlisting>
Modified: trunk/refman-5.1/replication-solutions.xml
===================================================================
--- trunk/refman-5.1/replication-solutions.xml 2009-11-07 17:40:36 UTC (rev 17514)
+++ trunk/refman-5.1/replication-solutions.xml 2009-11-07 17:41:41 UTC (rev 17515)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4109 bytes
@@ -53,8 +53,8 @@
<para>
To secure your replication communication you can encrypt the
- communication channel by using SSL to exchange data. Step-by-step
- instructions can be found in
+ communication channel by using SSL to exchange data. For
+ step-by-step instructions, see
<xref linkend="replication-solutions-ssl"/>.
</para>
@@ -63,19 +63,19 @@
<title>Using Replication for Backups</title>
<para>
- You can use replication as a backup solution by replicating data
- from the master to a slave, and then backing up the data slave.
- The slave can be paused and shut down without affecting the
- running operation of the master, so you can produce an effective
- snapshot of <quote>live</quote> data that would otherwise require
- a shutdown of the master database.
+ To use replication as a backup solution, replicate data from the
+ master to a slave, and then back up the data slave. The slave can
+ be paused and shut down without affecting the running operation of
+ the master, so you can produce an effective snapshot of
+ <quote>live</quote> data that would otherwise require a shutdown
+ of the master database.
</para>
<para>
- How you back up the database will depend on the size of the
- database and whether you are backing up only the data, or the data
- and the replication slave state so that you can rebuild the slave
- in the event of failure. There are therefore two choices:
+ How you back up the database depends on the size of the database
+ and whether you are backing up only the data, or the data and the
+ replication slave state so that you can rebuild the slave in the
+ event of failure. There are therefore two choices:
</para>
<para>
@@ -119,17 +119,18 @@
</para>
<para>
- When using <command>mysqldump</command>, you should stop the
- slave before starting the dump process to ensure that the dump
- contains a consistent set of data:
+ When using <command>mysqldump</command>, you should stop
+ replication on the slave before starting the dump process to
+ ensure that the dump contains a consistent set of data:
</para>
<orderedlist>
<listitem>
<para>
- Stop the slave from processing requests. You can stop the
- slave completely using <command>mysqladmin</command>:
+ Stop the slave from processing requests. You can stop
+ replication completely on the slave using
+ <command>mysqladmin</command>:
</para>
<programlisting>shell> <userinput>mysqladmin stop-slave</userinput></programlisting>
@@ -173,7 +174,7 @@
</orderedlist>
<para>
- In the preceding example you may want to add login credentials
+ In the preceding example, you may want to add login credentials
(user name, password) to the commands, and bundle the process up
into a script that you can run automatically each day.
</para>
@@ -181,7 +182,7 @@
<para>
If you use this approach, make sure you monitor the slave
replication process to ensure that the time taken to run the
- backup is not affecting the slave's ability to keep up with
+ backup does not affect the slave's ability to keep up with
events from the master. See
<xref linkend="replication-administration-status"/>. If the
slave is unable to keep up, you may want to add another slave
@@ -239,8 +240,7 @@
<listitem>
<para>
- Start the <command>mysqld</command> process again. Under
- Unix:
+ Start the MySQL server again. Under Unix:
</para>
<programlisting>shell> <userinput>mysqld_safe &</userinput></programlisting>
Modified: trunk/refman-5.4/replication-solutions.xml
===================================================================
--- trunk/refman-5.4/replication-solutions.xml 2009-11-07 17:40:36 UTC (rev 17514)
+++ trunk/refman-5.4/replication-solutions.xml 2009-11-07 17:41:41 UTC (rev 17515)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4109 bytes
@@ -53,8 +53,8 @@
<para>
To secure your replication communication you can encrypt the
- communication channel by using SSL to exchange data. Step-by-step
- instructions can be found in
+ communication channel by using SSL to exchange data. For
+ step-by-step instructions, see
<xref linkend="replication-solutions-ssl"/>.
</para>
@@ -63,19 +63,19 @@
<title>Using Replication for Backups</title>
<para>
- You can use replication as a backup solution by replicating data
- from the master to a slave, and then backing up the data slave.
- The slave can be paused and shut down without affecting the
- running operation of the master, so you can produce an effective
- snapshot of <quote>live</quote> data that would otherwise require
- a shutdown of the master database.
+ To use replication as a backup solution, replicate data from the
+ master to a slave, and then back up the data slave. The slave can
+ be paused and shut down without affecting the running operation of
+ the master, so you can produce an effective snapshot of
+ <quote>live</quote> data that would otherwise require a shutdown
+ of the master database.
</para>
<para>
- How you back up the database will depend on the size of the
- database and whether you are backing up only the data, or the data
- and the replication slave state so that you can rebuild the slave
- in the event of failure. There are therefore two choices:
+ How you back up the database depends on the size of the database
+ and whether you are backing up only the data, or the data and the
+ replication slave state so that you can rebuild the slave in the
+ event of failure. There are therefore two choices:
</para>
<para>
@@ -119,17 +119,18 @@
</para>
<para>
- When using <command>mysqldump</command>, you should stop the
- slave before starting the dump process to ensure that the dump
- contains a consistent set of data:
+ When using <command>mysqldump</command>, you should stop
+ replication on the slave before starting the dump process to
+ ensure that the dump contains a consistent set of data:
</para>
<orderedlist>
<listitem>
<para>
- Stop the slave from processing requests. You can stop the
- slave completely using <command>mysqladmin</command>:
+ Stop the slave from processing requests. You can stop
+ replication completely on the slave using
+ <command>mysqladmin</command>:
</para>
<programlisting>shell> <userinput>mysqladmin stop-slave</userinput></programlisting>
@@ -173,7 +174,7 @@
</orderedlist>
<para>
- In the preceding example you may want to add login credentials
+ In the preceding example, you may want to add login credentials
(user name, password) to the commands, and bundle the process up
into a script that you can run automatically each day.
</para>
@@ -181,7 +182,7 @@
<para>
If you use this approach, make sure you monitor the slave
replication process to ensure that the time taken to run the
- backup is not affecting the slave's ability to keep up with
+ backup does not affect the slave's ability to keep up with
events from the master. See
<xref linkend="replication-administration-status"/>. If the
slave is unable to keep up, you may want to add another slave
@@ -239,8 +240,7 @@
<listitem>
<para>
- Start the <command>mysqld</command> process again. Under
- Unix:
+ Start the MySQL server again. Under Unix:
</para>
<programlisting>shell> <userinput>mysqld_safe &</userinput></programlisting>
Modified: trunk/refman-5.5/replication-solutions.xml
===================================================================
--- trunk/refman-5.5/replication-solutions.xml 2009-11-07 17:40:36 UTC (rev 17514)
+++ trunk/refman-5.5/replication-solutions.xml 2009-11-07 17:41:41 UTC (rev 17515)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4109 bytes
@@ -53,8 +53,8 @@
<para>
To secure your replication communication you can encrypt the
- communication channel by using SSL to exchange data. Step-by-step
- instructions can be found in
+ communication channel by using SSL to exchange data. For
+ step-by-step instructions, see
<xref linkend="replication-solutions-ssl"/>.
</para>
@@ -63,19 +63,19 @@
<title>Using Replication for Backups</title>
<para>
- You can use replication as a backup solution by replicating data
- from the master to a slave, and then backing up the data slave.
- The slave can be paused and shut down without affecting the
- running operation of the master, so you can produce an effective
- snapshot of <quote>live</quote> data that would otherwise require
- a shutdown of the master database.
+ To use replication as a backup solution, replicate data from the
+ master to a slave, and then back up the data slave. The slave can
+ be paused and shut down without affecting the running operation of
+ the master, so you can produce an effective snapshot of
+ <quote>live</quote> data that would otherwise require a shutdown
+ of the master database.
</para>
<para>
- How you back up the database will depend on the size of the
- database and whether you are backing up only the data, or the data
- and the replication slave state so that you can rebuild the slave
- in the event of failure. There are therefore two choices:
+ How you back up the database depends on the size of the database
+ and whether you are backing up only the data, or the data and the
+ replication slave state so that you can rebuild the slave in the
+ event of failure. There are therefore two choices:
</para>
<para>
@@ -119,17 +119,18 @@
</para>
<para>
- When using <command>mysqldump</command>, you should stop the
- slave before starting the dump process to ensure that the dump
- contains a consistent set of data:
+ When using <command>mysqldump</command>, you should stop
+ replication on the slave before starting the dump process to
+ ensure that the dump contains a consistent set of data:
</para>
<orderedlist>
<listitem>
<para>
- Stop the slave from processing requests. You can stop the
- slave completely using <command>mysqladmin</command>:
+ Stop the slave from processing requests. You can stop
+ replication completely on the slave using
+ <command>mysqladmin</command>:
</para>
<programlisting>shell> <userinput>mysqladmin stop-slave</userinput></programlisting>
@@ -173,7 +174,7 @@
</orderedlist>
<para>
- In the preceding example you may want to add login credentials
+ In the preceding example, you may want to add login credentials
(user name, password) to the commands, and bundle the process up
into a script that you can run automatically each day.
</para>
@@ -181,7 +182,7 @@
<para>
If you use this approach, make sure you monitor the slave
replication process to ensure that the time taken to run the
- backup is not affecting the slave's ability to keep up with
+ backup does not affect the slave's ability to keep up with
events from the master. See
<xref linkend="replication-administration-status"/>. If the
slave is unable to keep up, you may want to add another slave
@@ -239,8 +240,7 @@
<listitem>
<para>
- Start the <command>mysqld</command> process again. Under
- Unix:
+ Start the MySQL server again. Under Unix:
</para>
<programlisting>shell> <userinput>mysqld_safe &</userinput></programlisting>
Modified: trunk/refman-6.0.sav/replication-solutions.xml
===================================================================
--- trunk/refman-6.0.sav/replication-solutions.xml 2009-11-07 17:40:36 UTC (rev 17514)
+++ trunk/refman-6.0.sav/replication-solutions.xml 2009-11-07 17:41:41 UTC (rev 17515)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4121 bytes
@@ -53,8 +53,8 @@
<para>
To secure your replication communication you can encrypt the
- communication channel by using SSL to exchange data. Step-by-step
- instructions can be found in
+ communication channel by using SSL to exchange data. For
+ step-by-step instructions, see
<xref linkend="replication-solutions-ssl"/>.
</para>
@@ -63,19 +63,19 @@
<title>Using Replication for Backups</title>
<para>
- You can use replication as a backup solution by replicating data
- from the master to a slave, and then backing up the data slave.
- The slave can be paused and shut down without affecting the
- running operation of the master, so you can produce an effective
- snapshot of <quote>live</quote> data that would otherwise require
- a shutdown of the master database.
+ To use replication as a backup solution, replicate data from the
+ master to a slave, and then back up the data slave. The slave can
+ be paused and shut down without affecting the running operation of
+ the master, so you can produce an effective snapshot of
+ <quote>live</quote> data that would otherwise require a shutdown
+ of the master database.
</para>
<para>
- How you back up the database will depend on the size of the
- database and whether you are backing up only the data, or the data
- and the replication slave state so that you can rebuild the slave
- in the event of failure. There are therefore two choices:
+ How you back up the database depends on the size of the database
+ and whether you are backing up only the data, or the data and the
+ replication slave state so that you can rebuild the slave in the
+ event of failure. There are therefore two choices:
</para>
<para>
@@ -119,17 +119,18 @@
</para>
<para>
- When using <command>mysqldump</command>, you should stop the
- slave before starting the dump process to ensure that the dump
- contains a consistent set of data:
+ When using <command>mysqldump</command>, you should stop
+ replication on the slave before starting the dump process to
+ ensure that the dump contains a consistent set of data:
</para>
<orderedlist>
<listitem>
<para>
- Stop the slave from processing requests. You can stop the
- slave completely using <command>mysqladmin</command>:
+ Stop the slave from processing requests. You can stop
+ replication completely on the slave using
+ <command>mysqladmin</command>:
</para>
<programlisting>shell> <userinput>mysqladmin stop-slave</userinput></programlisting>
@@ -173,7 +174,7 @@
</orderedlist>
<para>
- In the preceding example you may want to add login credentials
+ In the preceding example, you may want to add login credentials
(user name, password) to the commands, and bundle the process up
into a script that you can run automatically each day.
</para>
@@ -181,7 +182,7 @@
<para>
If you use this approach, make sure you monitor the slave
replication process to ensure that the time taken to run the
- backup is not affecting the slave's ability to keep up with
+ backup does not affect the slave's ability to keep up with
events from the master. See
<xref linkend="replication-administration-status"/>. If the
slave is unable to keep up, you may want to add another slave
@@ -239,8 +240,7 @@
<listitem>
<para>
- Start the <command>mysqld</command> process again. Under
- Unix:
+ Start the MySQL server again. Under Unix:
</para>
<programlisting>shell> <userinput>mysqld_safe &</userinput></programlisting>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17515 - in trunk: . refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0.sav | paul.dubois | 7 Nov |
