| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | November 3 2007 5:12pm |
| Subject: | svn commit - mysqldoc@docsrva: r8509 - in trunk: . refman-5.0 refman-5.1 refman-6.0 refman-common | ||
| View as plain text | |||
Author: paul Date: 2007-11-03 17:12:08 +0100 (Sat, 03 Nov 2007) New Revision: 8509 Log: r26516@frost: paul | 2007-11-03 10:17:46 -0500 Minor wording fixes. Modified: trunk/refman-5.0/replication-configuration.xml trunk/refman-5.0/replication-solutions.xml trunk/refman-5.1/replication-configuration.xml trunk/refman-5.1/replication-solutions.xml trunk/refman-6.0/replication-configuration.xml trunk/refman-6.0/replication-solutions.xml trunk/refman-common/connector-j.xml trunk/refman-common/replication-drbd.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32208 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26432 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32208 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26516 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581 Modified: trunk/refman-5.0/replication-configuration.xml =================================================================== --- trunk/refman-5.0/replication-configuration.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-5.0/replication-configuration.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3454 bytes @@ -179,7 +179,7 @@ <listitem> <para> If you are setting up a new MySQL master and one or more - slaves, then you need only setup up the configuration, as you + slaves, then you need only set up the configuration, as you have no data to exchange. For guidance on setting up replication in this situation, see <xref linkend="replication-howto-newservers"/>. @@ -191,7 +191,7 @@ If you are already running a MySQL server, and therefore already have data that will need to be transferred to your slaves before replication starts, have not previously - configured the binary log and are able to shutdown your MySQL + configured the binary log and are able to shut down your MySQL server for a short period during the process, see <xref linkend="replication-howto-existingdata"/>. </para> @@ -200,7 +200,7 @@ <listitem> <para> If you are setting up additional slaves to an existing - replication environment then you can setup the slaves without + replication environment then you can set up the slaves without affecting the master. See <xref linkend="replication-howto-additionalslaves"/>. </para> @@ -293,7 +293,7 @@ </para> <para> - To configure both these options you will need to shutdown your + To configure both these options you will need to shut down your MySQL server and edit the configuration of the <filename>my.cnf</filename> or <filename>my.ini</filename> file. </para> @@ -343,7 +343,7 @@ The only option you must configure on the slave is to set the unique server ID. If this option is not already set, or the current value conflicts with the value that you have chosen for - the master server, then you should shutdown your slave server, + the master server, then you should shut down your slave server, and edit the configuration to specify the server id. For example: </para> @@ -885,7 +885,7 @@ <para> If you have not already configured the <option>server-id</option> and binary logging, you will need - to shutdown your master to configure these options. See + to shut down your master to configure these options. See <xref linkend="replication-howto-masterbaseconfig"/>. </para> @@ -1088,7 +1088,7 @@ <listitem> <para> - Shutdown the existing slave (slavea): + Shut down the existing slave (slavea): </para> <programlisting>shell> mysqladmin shutdown</programlisting> @@ -1143,7 +1143,7 @@ <title>Setting the Master Configuration on the Slave</title> <para> - To setup the slave to communicate with the master for + To set up the slave to communicate with the master for replication, you must tell the slave the necessary connection information. To do this, execute the following statement on the slave, replacing the option values with the actual values Modified: trunk/refman-5.0/replication-solutions.xml =================================================================== --- trunk/refman-5.0/replication-solutions.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-5.0/replication-solutions.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 5, Lines Added: 9, Lines Deleted: 9; 3302 bytes @@ -15,7 +15,7 @@ <para> For information on using replication in a backup environment, - including notes on the setup, backup procedure, and files to backup, + including notes on the setup, backup procedure, and files to back up, see <xref linkend="replication-solutions-backups"/>. </para> @@ -65,7 +65,7 @@ <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. - Because the slave can be paused and shutdown without affecting the + Because the slave can be paused and shut down without affecting the running operation of the master you can produce an effective snapshot of 'live' data that would otherwise require a shutdown of the master database. @@ -79,7 +79,7 @@ </para> <para> - If you are using replication as a solution to enable you to backup + If you are using replication as a solution to enable you to back up the data on the master, and the size of your database is not too large, then the <literal>mysqldump</literal> tool may be suitable. See <xref linkend="replication-solutions-backups-mysqldump"/>. @@ -87,9 +87,9 @@ <para> For larger databases, where <literal>mysqldump</literal> would be - impractical or inefficient, you can backup the raw data files + impractical or inefficient, you can back up the raw data files instead. Using the raw data files option also means that you can - backup the binary and relay logs that will enable you to recreate + back up the binary and relay logs that will enable you to recreate the slave in the event of a slave failure. For more information, see <xref linkend="replication-solutions-backups-rawdata"/>. </para> @@ -185,25 +185,25 @@ <para> To guarantee the integrity of the files that are copied, backing up the raw data files on your MySQL replication slave should - take place while your slave server is shutdown. If the MySQL + take place while your slave server is shut down. If the MySQL server is still running then background tasks, particularly with storage engines with background processes such as InnoDB, may still be updating the database files. With InnoDB, these problems should be resolved during crash recovery, but since the - slave server can be shutdown during the backup process without + slave server can be shut down during the backup process without affecting the execution of the master it makes sense to take advantage of this facility. </para> <para> - To shutdown the server and backup the files: + To shut down the server and back up the files: </para> <orderedlist> <listitem> <para> - Shutdown the slave MySQL server: + Shut down the slave MySQL server: </para> <programlisting>shell> mysqladmin shutdown</programlisting> Modified: trunk/refman-5.1/replication-configuration.xml =================================================================== --- trunk/refman-5.1/replication-configuration.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-5.1/replication-configuration.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3454 bytes @@ -191,7 +191,7 @@ <listitem> <para> If you are setting up a new MySQL master and one or more - slaves, then you need only setup up the configuration, as you + slaves, then you need only set up the configuration, as you have no data to exchange. For guidance on setting up replication in this situation, see <xref linkend="replication-howto-newservers"/>. @@ -203,7 +203,7 @@ If you are already running a MySQL server, and therefore already have data that will need to be transferred to your slaves before replication starts, have not previously - configured the binary log and are able to shutdown your MySQL + configured the binary log and are able to shut down your MySQL server for a short period during the process, see <xref linkend="replication-howto-existingdata"/>. </para> @@ -212,7 +212,7 @@ <listitem> <para> If you are setting up additional slaves to an existing - replication environment then you can setup the slaves without + replication environment then you can set up the slaves without affecting the master. See <xref linkend="replication-howto-additionalslaves"/>. </para> @@ -305,7 +305,7 @@ </para> <para> - To configure both these options you will need to shutdown your + To configure both these options you will need to shut down your MySQL server and edit the configuration of the <filename>my.cnf</filename> or <filename>my.ini</filename> file. </para> @@ -355,7 +355,7 @@ The only option you must configure on the slave is to set the unique server ID. If this option is not already set, or the current value conflicts with the value that you have chosen for - the master server, then you should shutdown your slave server, + the master server, then you should shut down your slave server, and edit the configuration to specify the server id. For example: </para> @@ -897,7 +897,7 @@ <para> If you have not already configured the <option>server-id</option> and binary logging, you will need - to shutdown your master to configure these options. See + to shut down your master to configure these options. See <xref linkend="replication-howto-masterbaseconfig"/>. </para> @@ -1100,7 +1100,7 @@ <listitem> <para> - Shutdown the existing slave (slavea): + Shut down the existing slave (slavea): </para> <programlisting>shell> mysqladmin shutdown</programlisting> @@ -1155,7 +1155,7 @@ <title>Setting the Master Configuration on the Slave</title> <para> - To setup the slave to communicate with the master for + To set up the slave to communicate with the master for replication, you must tell the slave the necessary connection information. To do this, execute the following statement on the slave, replacing the option values with the actual values Modified: trunk/refman-5.1/replication-solutions.xml =================================================================== --- trunk/refman-5.1/replication-solutions.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-5.1/replication-solutions.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 5, Lines Added: 9, Lines Deleted: 9; 3302 bytes @@ -15,7 +15,7 @@ <para> For information on using replication in a backup environment, - including notes on the setup, backup procedure, and files to backup, + including notes on the setup, backup procedure, and files to back up, see <xref linkend="replication-solutions-backups"/>. </para> @@ -65,7 +65,7 @@ <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. - Because the slave can be paused and shutdown without affecting the + Because the slave can be paused and shut down without affecting the running operation of the master you can produce an effective snapshot of 'live' data that would otherwise require a shutdown of the master database. @@ -79,7 +79,7 @@ </para> <para> - If you are using replication as a solution to enable you to backup + If you are using replication as a solution to enable you to back up the data on the master, and the size of your database is not too large, then the <literal>mysqldump</literal> tool may be suitable. See <xref linkend="replication-solutions-backups-mysqldump"/>. @@ -87,9 +87,9 @@ <para> For larger databases, where <literal>mysqldump</literal> would be - impractical or inefficient, you can backup the raw data files + impractical or inefficient, you can back up the raw data files instead. Using the raw data files option also means that you can - backup the binary and relay logs that will enable you to recreate + back up the binary and relay logs that will enable you to recreate the slave in the event of a slave failure. For more information, see <xref linkend="replication-solutions-backups-rawdata"/>. </para> @@ -185,25 +185,25 @@ <para> To guarantee the integrity of the files that are copied, backing up the raw data files on your MySQL replication slave should - take place while your slave server is shutdown. If the MySQL + take place while your slave server is shut down. If the MySQL server is still running then background tasks, particularly with storage engines with background processes such as InnoDB, may still be updating the database files. With InnoDB, these problems should be resolved during crash recovery, but since the - slave server can be shutdown during the backup process without + slave server can be shut down during the backup process without affecting the execution of the master it makes sense to take advantage of this facility. </para> <para> - To shutdown the server and backup the files: + To shut down the server and back up the files: </para> <orderedlist> <listitem> <para> - Shutdown the slave MySQL server: + Shut down the slave MySQL server: </para> <programlisting>shell> mysqladmin shutdown</programlisting> Modified: trunk/refman-6.0/replication-configuration.xml =================================================================== --- trunk/refman-6.0/replication-configuration.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-6.0/replication-configuration.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3454 bytes @@ -191,7 +191,7 @@ <listitem> <para> If you are setting up a new MySQL master and one or more - slaves, then you need only setup up the configuration, as you + slaves, then you need only set up the configuration, as you have no data to exchange. For guidance on setting up replication in this situation, see <xref linkend="replication-howto-newservers"/>. @@ -203,7 +203,7 @@ If you are already running a MySQL server, and therefore already have data that will need to be transferred to your slaves before replication starts, have not previously - configured the binary log and are able to shutdown your MySQL + configured the binary log and are able to shut down your MySQL server for a short period during the process, see <xref linkend="replication-howto-existingdata"/>. </para> @@ -212,7 +212,7 @@ <listitem> <para> If you are setting up additional slaves to an existing - replication environment then you can setup the slaves without + replication environment then you can set up the slaves without affecting the master. See <xref linkend="replication-howto-additionalslaves"/>. </para> @@ -305,7 +305,7 @@ </para> <para> - To configure both these options you will need to shutdown your + To configure both these options you will need to shut down your MySQL server and edit the configuration of the <filename>my.cnf</filename> or <filename>my.ini</filename> file. </para> @@ -355,7 +355,7 @@ The only option you must configure on the slave is to set the unique server ID. If this option is not already set, or the current value conflicts with the value that you have chosen for - the master server, then you should shutdown your slave server, + the master server, then you should shut down your slave server, and edit the configuration to specify the server id. For example: </para> @@ -894,7 +894,7 @@ <para> If you have not already configured the <option>server-id</option> and binary logging, you will need - to shutdown your master to configure these options. See + to shut down your master to configure these options. See <xref linkend="replication-howto-masterbaseconfig"/>. </para> @@ -1097,7 +1097,7 @@ <listitem> <para> - Shutdown the existing slave (slavea): + Shut down the existing slave (slavea): </para> <programlisting>shell> mysqladmin shutdown</programlisting> @@ -1152,7 +1152,7 @@ <title>Setting the Master Configuration on the Slave</title> <para> - To setup the slave to communicate with the master for + To set up the slave to communicate with the master for replication, you must tell the slave the necessary connection information. To do this, execute the following statement on the slave, replacing the option values with the actual values Modified: trunk/refman-6.0/replication-solutions.xml =================================================================== --- trunk/refman-6.0/replication-solutions.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-6.0/replication-solutions.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 5, Lines Added: 9, Lines Deleted: 9; 3302 bytes @@ -15,7 +15,7 @@ <para> For information on using replication in a backup environment, - including notes on the setup, backup procedure, and files to backup, + including notes on the setup, backup procedure, and files to back up, see <xref linkend="replication-solutions-backups"/>. </para> @@ -65,7 +65,7 @@ <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. - Because the slave can be paused and shutdown without affecting the + Because the slave can be paused and shut down without affecting the running operation of the master you can produce an effective snapshot of 'live' data that would otherwise require a shutdown of the master database. @@ -79,7 +79,7 @@ </para> <para> - If you are using replication as a solution to enable you to backup + If you are using replication as a solution to enable you to back up the data on the master, and the size of your database is not too large, then the <literal>mysqldump</literal> tool may be suitable. See <xref linkend="replication-solutions-backups-mysqldump"/>. @@ -87,9 +87,9 @@ <para> For larger databases, where <literal>mysqldump</literal> would be - impractical or inefficient, you can backup the raw data files + impractical or inefficient, you can back up the raw data files instead. Using the raw data files option also means that you can - backup the binary and relay logs that will enable you to recreate + back up the binary and relay logs that will enable you to recreate the slave in the event of a slave failure. For more information, see <xref linkend="replication-solutions-backups-rawdata"/>. </para> @@ -185,25 +185,25 @@ <para> To guarantee the integrity of the files that are copied, backing up the raw data files on your MySQL replication slave should - take place while your slave server is shutdown. If the MySQL + take place while your slave server is shut down. If the MySQL server is still running then background tasks, particularly with storage engines with background processes such as InnoDB, may still be updating the database files. With InnoDB, these problems should be resolved during crash recovery, but since the - slave server can be shutdown during the backup process without + slave server can be shut down during the backup process without affecting the execution of the master it makes sense to take advantage of this facility. </para> <para> - To shutdown the server and backup the files: + To shut down the server and back up the files: </para> <orderedlist> <listitem> <para> - Shutdown the slave MySQL server: + Shut down the slave MySQL server: </para> <programlisting>shell> mysqladmin shutdown</programlisting> Modified: trunk/refman-common/connector-j.xml =================================================================== --- trunk/refman-common/connector-j.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-common/connector-j.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1633 bytes @@ -3847,7 +3847,7 @@ <para> For the examples in this section the MySQL world sample - database will be used. The first task is to setup a MySQL data + database will be used. The first task is to set up a MySQL data source through Spring. Components within Spring use the "bean" terminology. For example, to configure a connection to a MySQL server supporting the world sample database you might use: @@ -4144,7 +4144,7 @@ </programlisting> <para> - Now you need to setup the transaction configuration. The + Now you need to set up the transaction configuration. The first thing you must do is create transaction manager to manage the data source and a specification of what transaction properties are required for for the @@ -4209,7 +4209,7 @@ database connections available for web requests as needed. Although MySQL does not spawn an extra process when a connection is made, there is still a small amount of - overhead to create and setup the connection. Pooling of + overhead to create and set up the connection. Pooling of connections also alleviates problems such as collecting large amounts of sockets in the <literal>TIME_WAIT</literal> state. Modified: trunk/refman-common/replication-drbd.xml =================================================================== --- trunk/refman-common/replication-drbd.xml 2007-11-03 03:16:09 UTC (rev 8508) +++ trunk/refman-common/replication-drbd.xml 2007-11-03 16:12:08 UTC (rev 8509) Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1014 bytes @@ -609,7 +609,7 @@ <para> Once DRBD has been built and installed, you need to edit the <filename>/etc/drbd.conf</filename> file and then run a number - of commands to build the block device and setup the replication. + of commands to build the block device and set up the replication. </para> <para> @@ -850,7 +850,7 @@ </para> <para> - To setup a secondary node: + To set up a secondary node: </para> <orderedlist> @@ -1215,7 +1215,7 @@ </itemizedlist> <para> - To setup MySQL to use your new DRBD device and filesystem: + To set up MySQL to use your new DRBD device and filesystem: </para> <orderedlist>
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r8509 - in trunk: . refman-5.0 refman-5.1 refman-6.0 refman-common | paul | 3 Nov |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.885 sec. using MySQL 5.1.14-beta-log