Author: paul
Date: 2006-03-24 21:13:30 +0100 (Fri, 24 Mar 2006)
New Revision: 1667
Log:
r4118@kite-hub: paul | 2006-03-24 14:12:43 -0600
Fold in proof corrections.
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:8925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4104
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4118
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-03-24 19:03:43 UTC (rev 1666)
+++ trunk/refman-4.1/replication.xml 2006-03-24 20:13:30 UTC (rev 1667)
@@ -414,8 +414,8 @@
<literal>State</literal> column for a slave server I/O thread.
Beginning with MySQL 4.1.1, this state also appears in the
<literal>Slave_IO_State</literal> column displayed by
- <literal>SHOW SLAVE STATUS</literal>, so by using that
- statement, you can get a good view of what is happening.
+ <literal>SHOW SLAVE STATUS</literal>, so you can get a good view
+ of what is happening by using that statement.
</para>
<itemizedlist>
@@ -1775,8 +1775,8 @@
slave. That is, clients can use <literal>SET
NAMES</literal> or <literal>SET CHARACTER SET</literal> or
can set variables such as
- <literal>COLLATION_CLIENT</literal> or
- <literal>COLLATION_SERVER</literal>. However, clients are
+ <literal>collation_client</literal> or
+ <literal>collation_server</literal>. However, clients are
prevented from changing the <emphasis>global</emphasis>
value of these variables; as stated previously, the master
and slave must always have identical global character set
@@ -2392,14 +2392,14 @@
The <filename>master.info</filename> file format in 4.1.1 changed
to include values corresponding to the SSL options. In addition,
the 4.1.1 file format includes as its first line the number of
- lines in the file. If you upgrade an older server to 4.1.1, the
- new server upgrades the <filename>master.info</filename> file to
- the new format automatically when it starts. However, if you
- downgrade a 4.1.1 or newer server to a version older than 4.1.1,
- you should manually remove the first line before starting the
- older server for the first time. Note that, in this case, the
- downgraded server no longer can use an SSL connection to
- communicate with the master.
+ lines in the file. (See <xref linkend="slave-logs"/>.) If you
+ upgrade an older server to 4.1.1, the new server upgrades the
+ <filename>master.info</filename> file to the new format
+ automatically when it starts. However, if you downgrade a 4.1.1 or
+ newer server to a version older than 4.1.1, you should manually
+ remove the first line before starting the older server for the
+ first time. Note that, in this case, the downgraded server no
+ longer can use an SSL connection to communicate with the master.
</para>
<para>
@@ -2544,7 +2544,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--log-warnings</option>
+ <option>--log-warnings[=<replaceable>level</replaceable>]</option>
</para>
<para>
@@ -2631,7 +2631,7 @@
<para>
The name to use for the file in which the slave records
information about the master. The default name is
- <filename>mysql.info</filename> in the data directory.
+ <filename>master.info</filename> in the data directory.
</para>
</listitem>
@@ -2809,8 +2809,8 @@
authentication when it connects to the master. This account
must have the <literal>REPLICATION SLAVE</literal> privilege.
<literal>FILE</literal> privilege instead.) The value in the
- <filename>master.info</filename> file, if it can be read,
- takes precedence. If the master username is not set, the name
+ <filename>master.info</filename> file takes precedence if it
+ can be read. If the master username is not set, the name
<literal>test</literal> is assumed.
</para>
</listitem>
@@ -3660,8 +3660,8 @@
</para>
<para>
- The slave performs the following test At this stage, the slave
- checks whether there are any <option>--replicate-do-db</option> or
+ At this stage, the slave checks whether there are any
+ <option>--replicate-do-db</option> or
<option>--replicate-ignore-db</option> options that specify
database-specific conditions:
</para>
@@ -4806,7 +4806,7 @@
<para>
<emphasis role="bold">Q</emphasis>: Does replication work on mixed
operating systems (for example, the master runs on Linux while
- slaves run on Mac OS and Windows)?
+ slaves run on Mac OS X and Windows)?
</para>
<para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-03-24 19:03:43 UTC (rev 1666)
+++ trunk/refman-5.0/replication.xml 2006-03-24 20:13:30 UTC (rev 1667)
@@ -406,9 +406,9 @@
The following list shows the most common states you see in the
<literal>State</literal> column for a slave server I/O thread.
This state also appears in the <literal>Slave_IO_State</literal>
- column displayed by <literal>SHOW SLAVE STATUS</literal>, so by
- using that statement, you can get a good view of what is
- happening.
+ column displayed by <literal>SHOW SLAVE STATUS</literal>, so you
+ can get a good view of what is happening by using that
+ statement.
</para>
<itemizedlist>
@@ -1688,7 +1688,7 @@
works even if the master and slave have different global
character set variables. Starting from MySQL 5.0.4 (master and
slave), replication works even if the master and slave have
- different global timezone variables.
+ different global time zone variables.
</para>
</listitem>
@@ -1731,8 +1731,8 @@
slave. That is, clients can use <literal>SET
NAMES</literal> or <literal>SET CHARACTER SET</literal> or
can set variables such as
- <literal>COLLATION_CLIENT</literal> or
- <literal>COLLATION_SERVER</literal>. However, clients are
+ <literal>collation_client</literal> or
+ <literal>collation_server</literal>. However, clients are
prevented from changing the <emphasis>global</emphasis>
value of these variables; as stated previously, the master
and slave must always have identical global character set
@@ -1755,7 +1755,7 @@
that tables in those databases do not implicitly rely on
the database default character set (see Bug #2326). A good
workaround is to state the character set and collation
- explicitly in <literal>CREATE TABLE</literal>.
+ explicitly in <literal>CREATE TABLE</literal> statements.
</para>
</listitem>
@@ -1833,7 +1833,7 @@
<literal>@<replaceable>var_name</replaceable></literal>) are
replicated correctly in MySQL ¤t-series;. However, this
is not true for versions prior to 4.1. Note that user variable
- names are case insensitive starting in MySQL 5.0. you should
+ names are case insensitive starting in MySQL 5.0. You should
take this into account when setting up replication between
MySQL 5.0 and older versions.
</para>
@@ -1939,7 +1939,7 @@
<listitem>
<para>
- MySQL only supports one master and many slaves. In the future
+ MySQL supports only one master and many slaves. In the future
we plan to add a voting algorithm for changing the master
automatically in the event of problems with the current
master. We also plan to introduce agent processes to help
@@ -2302,12 +2302,13 @@
The <filename>master.info</filename> file format in MySQL
¤t-series; includes values corresponding to the SSL options.
In addition, the file format includes as its first line the number
- of lines in the file. If you upgrade an older server (before MySQL
- 4.1.1) to a newer version, the new server upgrades the
- <filename>master.info</filename> file to the new format
- automatically when it starts. However, if you downgrade a newer
- server to an older version, you should remove the first line
- manually before starting the older server for the first time.
+ of lines in the file. (See <xref linkend="slave-logs"/>.) If you
+ upgrade an older server (before MySQL 4.1.1) to a newer version,
+ the new server upgrades the <filename>master.info</filename> file
+ to the new format automatically when it starts. However, if you
+ downgrade a newer server to an older version, you should remove
+ the first line manually before starting the older server for the
+ first time.
</para>
<para>
@@ -2452,7 +2453,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--log-warnings</option>
+ <option>--log-warnings[=<replaceable>level</replaceable>]</option>
</para>
<para>
@@ -2533,7 +2534,7 @@
<para>
The name to use for the file in which the slave records
information about the master. The default name is
- <filename>mysql.info</filename> in the data directory.
+ <filename>master.info</filename> in the data directory.
</para>
</listitem>
@@ -2706,8 +2707,8 @@
The username of the account that the slave thread uses for
authentication when it connects to the master. This account
must have the <literal>REPLICATION SLAVE</literal> privilege.
- The value in the <filename>master.info</filename> file, if it
- can be read, takes precedence. If the master username is not
+ The value in the <filename>master.info</filename> file takes
+ precedence if it can be read. If the master username is not
set, the name <literal>test</literal> is assumed.
</para>
</listitem>
@@ -3536,8 +3537,8 @@
</para>
<para>
- The slave performs the following test At this stage, the slave
- checks whether there are any <option>--replicate-do-db</option> or
+ At this stage, the slave checks whether there are any
+ <option>--replicate-do-db</option> or
<option>--replicate-ignore-db</option> options that specify
database-specific conditions:
</para>
@@ -4689,7 +4690,7 @@
<para>
<emphasis role="bold">Q</emphasis>: Does replication work on mixed
operating systems (for example, the master runs on Linux while
- slaves run on Mac OS and Windows)?
+ slaves run on Mac OS X and Windows)?
</para>
<para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-03-24 19:03:43 UTC (rev 1666)
+++ trunk/refman-5.1/replication.xml 2006-03-24 20:13:30 UTC (rev 1667)
@@ -245,10 +245,10 @@
Replication capabilities in MySQL originally were based on
propagation of SQL statements from master to slave. This is called
<emphasis>statement-based replication</emphasis>. As of MySQL
- 5.1.5, another basis for replication is available. This is called
+ 5.1.5, another basis for replication is available called
<emphasis>row-based replication</emphasis>. Instead of sending SQL
statements to the slave, the master writes events to its binary
- log that indicate how individual table rows are effected. As of
+ log that indicate how individual table rows are affected. As of
MySQL 5.1.8, a third option is available: mixed. This will use
statement-based replication by default, and only switch to
row-based replication in particular cases as described below.
@@ -626,9 +626,9 @@
The following list shows the most common states you see in the
<literal>State</literal> column for a slave server I/O thread.
This state also appears in the <literal>Slave_IO_State</literal>
- column displayed by <literal>SHOW SLAVE STATUS</literal>, so by
- using that statement, you can get a good view of what is
- happening.
+ column displayed by <literal>SHOW SLAVE STATUS</literal>, so you
+ can get a good view of what is happening by using that
+ statement.
</para>
<itemizedlist>
@@ -1887,7 +1887,7 @@
Replication works correctly between MySQL 5.0 and 5.1 masters
and slaves in any combination, even if the master and slave
have different global character set variables, and even if the
- master and slave have different global timezone variables.
+ master and slave have different global time zone variables.
(Note that this is not true in cases when the master, slave,
or both are running MySQL 4.1 or earlier.)
</para>
@@ -1932,8 +1932,8 @@
slave. That is, clients can use <literal>SET
NAMES</literal> or <literal>SET CHARACTER SET</literal> or
can set variables such as
- <literal>COLLATION_CLIENT</literal> or
- <literal>COLLATION_SERVER</literal>. However, clients are
+ <literal>collation_client</literal> or
+ <literal>collation_server</literal>. However, clients are
prevented from changing the <emphasis>global</emphasis>
value of these variables; as stated previously, the master
and slave must always have identical global character set
@@ -1956,7 +1956,7 @@
that tables in those databases do not implicitly rely on
the database default character set (see Bug #2326). A good
workaround is to state the character set and collation
- explicitly in <literal>CREATE TABLE</literal>.
+ explicitly in <literal>CREATE TABLE</literal> statements.
</para>
</listitem>
@@ -2037,7 +2037,7 @@
<literal>@<replaceable>var_name</replaceable></literal>) are
replicated correctly; however this is not true for versions
prior to 4.1. Note that user variable names are case
- insensitive starting in MySQL 5.0. you should take this into
+ insensitive starting in MySQL 5.0. You should take this into
account when setting up replication between MySQL 5.0 and
older versions.
</para>
@@ -2133,7 +2133,7 @@
<listitem>
<para>
- MySQL only supports one master and many slaves. In the future
+ MySQL supports only one master and many slaves. In the future
we plan to add a voting algorithm for changing the master
automatically in the event of problems with the current
master. We also plan to introduce agent processes to help
@@ -2158,10 +2158,9 @@
<listitem>
<para>
- Note that this item does not apply when row-based replication
- is in use because in that case temporary tables aren't
- replicated at all. (See
- <xref linkend="replication-row-based"/>.)
+ This item does not apply when row-based replication is in use
+ because in that case temporary tables aren't replicated at
+ all. (See <xref linkend="replication-row-based"/>.)
</para>
<para>
@@ -2507,12 +2506,13 @@
The <filename>master.info</filename> file format in MySQL
¤t-series; includes values corresponding to the SSL options.
In addition, the file format includes as its first line the number
- of lines in the file. If you upgrade an older server (before MySQL
- 4.1.1) to a newer version, the new server upgrades the
- <filename>master.info</filename> file to the new format
- automatically when it starts. However, if you downgrade a newer
- server to an older version, you should remove the first line
- manually before starting the older server for the first time.
+ of lines in the file. (See <xref linkend="slave-logs"/>.) If you
+ upgrade an older server (before MySQL 4.1.1) to a newer version,
+ the new server upgrades the <filename>master.info</filename> file
+ to the new format automatically when it starts. However, if you
+ downgrade a newer server to an older version, you should remove
+ the first line manually before starting the older server for the
+ first time.
</para>
<para>
@@ -2657,7 +2657,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--log-warnings</option>
+ <option>--log-warnings[=<replaceable>level</replaceable>]</option>
</para>
<para>
@@ -2738,7 +2738,7 @@
<para>
The name to use for the file in which the slave records
information about the master. The default name is
- <filename>mysql.info</filename> in the data directory.
+ <filename>master.info</filename> in the data directory.
</para>
</listitem>
@@ -2911,8 +2911,8 @@
The username of the account that the slave thread uses for
authentication when it connects to the master. This account
must have the <literal>REPLICATION SLAVE</literal> privilege.
- The value in the <filename>master.info</filename> file, if it
- can be read, takes precedence. If the master username is not
+ The value in the <filename>master.info</filename> file takes
+ precedence if it can be read. If the master username is not
set, the name <literal>test</literal> is assumed.
</para>
</listitem>
@@ -3741,8 +3741,8 @@
</para>
<para>
- The slave performs the following test At this stage, the slave
- checks whether there are any <option>--replicate-do-db</option> or
+ At this stage, the slave checks whether there are any
+ <option>--replicate-do-db</option> or
<option>--replicate-ignore-db</option> options that specify
database-specific conditions:
</para>
@@ -4957,7 +4957,7 @@
<para>
<emphasis role="bold">Q</emphasis>: Does replication work on mixed
operating systems (for example, the master runs on Linux while
- slaves run on Mac OS and Windows)?
+ slaves run on Mac OS X and Windows)?
</para>
<para>
@@ -5056,7 +5056,7 @@
<listitem>
<para>
Statements cannot be replicated properly if they use a UDF
- that is non-deterministic (its value depends on other things
+ that is non-deterministic (its value depends on other factors
than the given parameters).
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1667 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 24 Mar |
