Author: paul
Date: 2006-02-19 02:29:07 +0100 (Sun, 19 Feb 2006)
New Revision: 1394
Log:
r7854@frost: paul | 2006-02-18 19:28:14 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/ndbcluster.xml
trunk/refman-5.0/ndbcluster.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.1/ndbcluster.xml
trunk/refman-5.1/replication.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7849
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3223
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7854
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3223
Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-4.1/ndbcluster.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -7480,7 +7480,7 @@
<entry>Report arbitrator results</entry>
<entry>2</entry>
<entry><literal>ALERT</literal></entry>
- <entry>There are 8 different possible results for arbitration
attempts:
+ <entry>There are eight different possible results for arbitration
attempts:
<itemizedlist>
@@ -7598,7 +7598,7 @@
<entry>Report whether an arbitrator is found or not</entry>
<entry>6</entry>
<entry><literal>INFO</literal></entry>
- <entry>There are 7 different possible outcomes when seeking an
arbitrator:
+ <entry>There are seven different possible outcomes when seeking an
arbitrator:
<itemizedlist>
Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-5.0/ndbcluster.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -7456,7 +7456,7 @@
<entry>Report arbitrator results</entry>
<entry>2</entry>
<entry><literal>ALERT</literal></entry>
- <entry>There are 8 different possible results for arbitration
attempts:
+ <entry>There are eight different possible results for arbitration
attempts:
<itemizedlist>
@@ -7574,7 +7574,7 @@
<entry>Report whether an arbitrator is found or not</entry>
<entry>6</entry>
<entry><literal>INFO</literal></entry>
- <entry>There are 7 different possible outcomes when seeking an
arbitrator:
+ <entry>There are seven different possible outcomes when seeking an
arbitrator:
<itemizedlist>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-5.0/replication.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -1901,28 +1901,29 @@
<listitem>
<para>
- The <literal>FLUSH LOGS</literal>, <literal>FLUSH
+ Some forms of the <literal>FLUSH</literal> statement are not
+ logged because they could cause problems if replicated to a
+ slave: <literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
- <literal>FLUSH TABLES WITH READ LOCK</literal> statements are
- not logged because any of these could cause problems if
- replicated to a slave. For a syntax example, see
- <xref linkend="flush"/>. The <literal>FLUSH TABLES</literal>,
- <literal>ANALYZE TABLE</literal>, <literal>OPTIMIZE
- TABLE</literal>, and <literal>REPAIR TABLE</literal>
- statements are written to the binary log and thus replicated
- to slaves. This is not normally a problem because these
- statements do not modify table data. However, this can cause
- difficulties under certain circumstances. If you replicate the
- privilege tables in the <literal>mysql</literal> database and
- update those tables directly without using
- <literal>GRANT</literal>, you must issue a <literal>FLUSH
- PRIVILEGES</literal> on the slaves to put the new privileges
- into effect. In addition, if you use <literal>FLUSH
- TABLES</literal> when renaming a <literal>MyISAM</literal>
- table that is part of a <literal>MERGE</literal> table, you
- must issue <literal>FLUSH TABLES</literal> manually on the
- slaves. These statements are written to the binary log unless
- you specify <literal>NO_WRITE_TO_BINLOG</literal> or its alias
+ <literal>FLUSH TABLES WITH READ LOCK</literal>. For a syntax
+ example, see <xref linkend="flush"/>. The <literal>FLUSH
+ TABLES</literal>, <literal>ANALYZE TABLE</literal>,
+ <literal>OPTIMIZE TABLE</literal>, and <literal>REPAIR
+ TABLE</literal> statements are written to the binary log and
+ thus replicated to slaves. This is not normally a problem
+ because these statements do not modify table data. However,
+ this can cause difficulties under certain circumstances. If
+ you replicate the privilege tables in the
+ <literal>mysql</literal> database and update those tables
+ directly without using <literal>GRANT</literal>, you must
+ issue a <literal>FLUSH PRIVILEGES</literal> on the slaves to
+ put the new privileges into effect. In addition, if you use
+ <literal>FLUSH TABLES</literal> when renaming a
+ <literal>MyISAM</literal> table that is part of a
+ <literal>MERGE</literal> table, you must issue <literal>FLUSH
+ TABLES</literal> manually on the slaves. These statements are
+ written to the binary log unless you specify
+ <literal>NO_WRITE_TO_BINLOG</literal> or its alias
<literal>LOCAL</literal>.
</para>
</listitem>
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-5.0/storage-engines.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -63,14 +63,6 @@
</indexterm>
<indexterm>
- <primary><literal>ISAM</literal> storage engine</primary>
- </indexterm>
-
- <indexterm>
- <primary><literal>ISAM</literal> table type</primary>
- </indexterm>
-
- <indexterm>
<primary><literal>InnoDB</literal> storage engine</primary>
</indexterm>
Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-5.1/ndbcluster.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -7438,7 +7438,7 @@
<entry>Report arbitrator results</entry>
<entry>2</entry>
<entry><literal>ALERT</literal></entry>
- <entry>There are 8 different possible results for arbitration
attempts:
+ <entry>There are eight different possible results for arbitration
attempts:
<itemizedlist>
@@ -7556,7 +7556,7 @@
<entry>Report whether an arbitrator is found or not</entry>
<entry>6</entry>
<entry><literal>INFO</literal></entry>
- <entry>There are 7 different possible outcomes when seeking an
arbitrator:
+ <entry>There are seven different possible outcomes when seeking an
arbitrator:
<itemizedlist>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-02-19 01:28:53 UTC (rev 1393)
+++ trunk/refman-5.1/replication.xml 2006-02-19 01:29:07 UTC (rev 1394)
@@ -2069,28 +2069,29 @@
<listitem>
<para>
- The <literal>FLUSH LOGS</literal>, <literal>FLUSH
+ Some forms of the <literal>FLUSH</literal> statement are not
+ logged because they could cause problems if replicated to a
+ slave: <literal>FLUSH LOGS</literal>, <literal>FLUSH
MASTER</literal>, <literal>FLUSH SLAVE</literal>, and
- <literal>FLUSH TABLES WITH READ LOCK</literal> statements are
- not logged because any of these could cause problems if
- replicated to a slave. For a syntax example, see
- <xref linkend="flush"/>. The <literal>FLUSH TABLES</literal>,
- <literal>ANALYZE TABLE</literal>, <literal>OPTIMIZE
- TABLE</literal>, and <literal>REPAIR TABLE</literal>
- statements are written to the binary log and thus replicated
- to slaves. This is not normally a problem because these
- statements do not modify table data. However, this can cause
- difficulties under certain circumstances. If you replicate the
- privilege tables in the <literal>mysql</literal> database and
- update those tables directly without using
- <literal>GRANT</literal>, you must issue a <literal>FLUSH
- PRIVILEGES</literal> on the slaves to put the new privileges
- into effect. In addition, if you use <literal>FLUSH
- TABLES</literal> when renaming a <literal>MyISAM</literal>
- table that is part of a <literal>MERGE</literal> table, you
- must issue <literal>FLUSH TABLES</literal> manually on the
- slaves. These statements are written to the binary log unless
- you specify <literal>NO_WRITE_TO_BINLOG</literal> or its alias
+ <literal>FLUSH TABLES WITH READ LOCK</literal>. For a syntax
+ example, see <xref linkend="flush"/>. The <literal>FLUSH
+ TABLES</literal>, <literal>ANALYZE TABLE</literal>,
+ <literal>OPTIMIZE TABLE</literal>, and <literal>REPAIR
+ TABLE</literal> statements are written to the binary log and
+ thus replicated to slaves. This is not normally a problem
+ because these statements do not modify table data. However,
+ this can cause difficulties under certain circumstances. If
+ you replicate the privilege tables in the
+ <literal>mysql</literal> database and update those tables
+ directly without using <literal>GRANT</literal>, you must
+ issue a <literal>FLUSH PRIVILEGES</literal> on the slaves to
+ put the new privileges into effect. In addition, if you use
+ <literal>FLUSH TABLES</literal> when renaming a
+ <literal>MyISAM</literal> table that is part of a
+ <literal>MERGE</literal> table, you must issue <literal>FLUSH
+ TABLES</literal> manually on the slaves. These statements are
+ written to the binary log unless you specify
+ <literal>NO_WRITE_TO_BINLOG</literal> or its alias
<literal>LOCAL</literal>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1394 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 19 Feb |