Author: paul
Date: 2009-07-02 01:27:28 +0200 (Thu, 02 Jul 2009)
New Revision: 15553
Log:
r42608@frost: paul | 2009-07-01 18:26:28 -0500
ESG conformance
Modified:
trunk/refman-4.1/dba-user-management-core.xml
trunk/refman-5.0/dba-user-management-core.xml
trunk/refman-5.1/dba-log-files.xml
trunk/refman-5.1/dba-user-management-core.xml
trunk/refman-5.4/dba-log-files.xml
trunk/refman-5.4/dba-user-management-core.xml
trunk/refman-6.0/dba-log-files.xml
trunk/refman-6.0/dba-user-management-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 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:42606
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:39180
+ 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:42608
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:39180
Modified: trunk/refman-4.1/dba-user-management-core.xml
===================================================================
--- trunk/refman-4.1/dba-user-management-core.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-4.1/dba-user-management-core.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 629 bytes
@@ -2930,7 +2930,7 @@
variable of your server:
</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>
@@ -2992,7 +2992,7 @@
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>
Depending on your version of Windows, the preceding instructions
Modified: trunk/refman-5.0/dba-user-management-core.xml
===================================================================
--- trunk/refman-5.0/dba-user-management-core.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-5.0/dba-user-management-core.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 629 bytes
@@ -3062,7 +3062,7 @@
variable of your server:
</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>
@@ -3124,7 +3124,7 @@
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>
Depending on your version of Windows, the preceding instructions
Modified: trunk/refman-5.1/dba-log-files.xml
===================================================================
--- trunk/refman-5.1/dba-log-files.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-5.1/dba-log-files.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 9, Lines Added: 33, Lines Deleted: 35; 6391 bytes
@@ -1398,26 +1398,25 @@
by starting <command>mysqld</command> with the option
<option role="mysqld">--binlog-format=MIXED</option>.
</para>
-
- <para>
- Mixed logging is available beginning with MySQL 5.1.8. In
- MySQL 5.1.12, it become the default logging mode; in 5.1.29,
- the default was changed back to
- <literal>STATEMENT</literal>.
- </para>
-
- <para>
- Starting with MySQL 5.1.20, the logging format can also be
- set or limited by the storage engine being used. This helps
- to eliminate issues when logging, and more specifically
- replicating, certain statements between a master and slave
- which are using different storage engines.
- </para>
</listitem>
</itemizedlist>
<para>
+ Mixed logging is available beginning with MySQL 5.1.8. In MySQL
+ 5.1.12, it become the default logging mode; in 5.1.29, the
+ default was changed back to <literal>STATEMENT</literal>.
+ </para>
+
+ <para>
+ Starting with MySQL 5.1.20, the logging format can also be set
+ or limited by the storage engine being used. This helps to
+ eliminate issues when logging, and more specifically
+ replicating, certain statements between a master and slave which
+ are using different storage engines.
+ </para>
+
+ <para>
With MySQL's classic statement-based replication, there may
be issues with replicating nondeterministic statements. In
deciding whether or not a given statement is safe for
@@ -1614,21 +1613,21 @@
<listitem>
<para>
- From within a stored function or a trigger.
+ From within a stored function or a trigger
</para>
</listitem>
<listitem>
<para>
If the <literal role="se">NDBCLUSTER</literal> storage
- engine is enabled.
+ engine is enabled
</para>
</listitem>
<listitem>
<para>
If the session is currently in row-based replication mode
- and has open temporary tables.
+ and has open temporary tables
</para>
</listitem>
@@ -1697,28 +1696,28 @@
<listitem>
<para>
When a DML statement updates an
- <literal role="se">NDBCLUSTER</literal> table
+ <literal role="se">NDBCLUSTER</literal> table.
</para>
</listitem>
<listitem>
<para>
When a function contains
- <literal role="func">UUID()</literal>
+ <literal role="func">UUID()</literal>.
</para>
</listitem>
<listitem>
<para>
When 2 or more tables with <literal>AUTO_INCREMENT</literal>
- columns are updated
+ columns are updated.
</para>
</listitem>
<listitem>
<para>
When any <literal role="stmt">INSERT DELAYED</literal> is
- executed
+ executed.
</para>
</listitem>
@@ -1727,13 +1726,13 @@
When the body of a view requires row-based replication, the
statement creating the view also uses it — for
example, this occurs when the statement creating a view uses
- the <literal role="func">UUID()</literal> function
+ the <literal role="func">UUID()</literal> function.
</para>
</listitem>
<listitem>
<para>
- When a call to a UDF is involved
+ When a call to a UDF is involved.
</para>
</listitem>
@@ -1743,12 +1742,12 @@
the statement has any temporary tables, then logging by row
is used for all subsequent statements (except for those
accessing temporary tables) until all temporary tables in
- use by that client are dropped
+ use by that client are dropped.
</para>
<para>
This is true whether or not any temporary tables are
- actually logged
+ actually logged.
</para>
<para>
@@ -1757,7 +1756,7 @@
statements using that table are unsafe, and we approximate
this condition by treating all statements made by that
client as unsafe until the client no longer holds any
- temporary tables
+ temporary tables.
</para>
</listitem>
@@ -1771,7 +1770,7 @@
<listitem>
<para>
When <literal role="func">FOUND_ROWS()</literal> or
- <literal role="func">ROW_COUNT()</literal> is used (Bug
+ <literal role="func">ROW_COUNT()</literal> is used. (Bug
#12092, Bug #30244)
</para>
</listitem>
@@ -1780,8 +1779,8 @@
<para>
When <literal role="func">USER()</literal>,
<literal role="func">CURRENT_USER()</literal>, or
- <literal role="func">CURRENT_USER</literal> is used (Bug
- #28086)
+ <literal role="func">CURRENT_USER</literal> is used.
+ (Bug #28086)
</para>
</listitem>
@@ -1912,16 +1911,15 @@
<listitem>
<para>
- If an engine supports row-based logging, then the engine is
- said to be <firstterm>row-logging capable</firstterm>.
+ If an engine supports row-based logging, the engine is said
+ to be <firstterm>row-logging capable</firstterm>.
</para>
</listitem>
<listitem>
<para>
- If an engine supports statement-based logging, then the
- engine is said to be <firstterm>statement-logging
- capable</firstterm>.
+ If an engine supports statement-based logging, the engine is
+ said to be <firstterm>statement-logging capable</firstterm>.
</para>
</listitem>
Modified: trunk/refman-5.1/dba-user-management-core.xml
===================================================================
--- trunk/refman-5.1/dba-user-management-core.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-5.1/dba-user-management-core.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 629 bytes
@@ -3072,7 +3072,7 @@
variable of your server:
</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>
@@ -3134,7 +3134,7 @@
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>
Depending on your version of Windows, the preceding instructions
Modified: trunk/refman-5.4/dba-log-files.xml
===================================================================
--- trunk/refman-5.4/dba-log-files.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-5.4/dba-log-files.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 8, Lines Added: 30, Lines Deleted: 32; 5957 bytes
@@ -1297,24 +1297,23 @@
by starting <command>mysqld</command> with the option
<option role="mysqld">--binlog-format=MIXED</option>.
</para>
-
- <para>
- Statement-based logging is the default logging mode in MySQL
- 5.4.
- </para>
-
- <para>
- The logging format can also be set or limited by the storage
- engine being used. This helps to eliminate issues when
- logging, and more specifically replicating, certain
- statements between a master and slave which are using
- different storage engines.
- </para>
</listitem>
</itemizedlist>
<para>
+ Statement-based logging is the default logging mode in MySQL
+ 5.4.
+ </para>
+
+ <para>
+ The logging format can also be set or limited by the storage
+ engine being used. This helps to eliminate issues when logging,
+ and more specifically replicating, certain statements between a
+ master and slave which are using different storage engines.
+ </para>
+
+ <para>
With MySQL's classic statement-based replication, there may
be issues with replicating nondeterministic statements. In
deciding whether or not a given statement is safe for
@@ -1490,21 +1489,21 @@
<listitem>
<para>
- From within a stored function or a trigger.
+ From within a stored function or a trigger
</para>
</listitem>
<listitem>
<para>
If the <literal role="se">NDBCLUSTER</literal> storage
- engine is enabled.
+ engine is enabled
</para>
</listitem>
<listitem>
<para>
If the session is currently in row-based replication mode
- and has open temporary tables.
+ and has open temporary tables
</para>
</listitem>
@@ -1573,28 +1572,28 @@
<listitem>
<para>
When a DML statement updates an
- <literal role="se">NDBCLUSTER</literal> table
+ <literal role="se">NDBCLUSTER</literal> table.
</para>
</listitem>
<listitem>
<para>
When a function contains
- <literal role="func">UUID()</literal>
+ <literal role="func">UUID()</literal>.
</para>
</listitem>
<listitem>
<para>
When 2 or more tables with <literal>AUTO_INCREMENT</literal>
- columns are updated
+ columns are updated.
</para>
</listitem>
<listitem>
<para>
When any <literal role="stmt">INSERT DELAYED</literal> is
- executed
+ executed.
</para>
</listitem>
@@ -1603,13 +1602,13 @@
When the body of a view requires row-based replication, the
statement creating the view also uses it — for
example, this occurs when the statement creating a view uses
- the <literal role="func">UUID()</literal> function
+ the <literal role="func">UUID()</literal> function.
</para>
</listitem>
<listitem>
<para>
- When a call to a UDF is involved
+ When a call to a UDF is involved.
</para>
</listitem>
@@ -1619,12 +1618,12 @@
the statement has any temporary tables, then logging by row
is used for all subsequent statements (except for those
accessing temporary tables) until all temporary tables in
- use by that client are dropped
+ use by that client are dropped.
</para>
<para>
This is true whether or not any temporary tables are
- actually logged
+ actually logged.
</para>
<para>
@@ -1633,14 +1632,14 @@
statements using that table are unsafe, and we approximate
this condition by treating all statements made by that
client as unsafe until the client no longer holds any
- temporary tables
+ temporary tables.
</para>
</listitem>
<listitem>
<para>
When <literal role="func">FOUND_ROWS()</literal> or
- <literal role="func">ROW_COUNT()</literal> is used (Bug
+ <literal role="func">ROW_COUNT()</literal> is used. (Bug
#12092, Bug #30244)
</para>
</listitem>
@@ -1649,7 +1648,7 @@
<para>
When <literal role="func">USER()</literal>,
<literal role="func">CURRENT_USER()</literal>, or
- <literal role="func">CURRENT_USER</literal> is used (Bug
+ <literal role="func">CURRENT_USER</literal> is used. (Bug
#28086)
</para>
</listitem>
@@ -1776,16 +1775,15 @@
<listitem>
<para>
- If an engine supports row-based logging, then the engine is
- said to be <firstterm>row-logging capable</firstterm>.
+ If an engine supports row-based logging, the engine is said
+ to be <firstterm>row-logging capable</firstterm>.
</para>
</listitem>
<listitem>
<para>
- If an engine supports statement-based logging, then the
- engine is said to be <firstterm>statement-logging
- capable</firstterm>.
+ If an engine supports statement-based logging, the engine is
+ said to be <firstterm>statement-logging capable</firstterm>.
</para>
</listitem>
Modified: trunk/refman-5.4/dba-user-management-core.xml
===================================================================
--- trunk/refman-5.4/dba-user-management-core.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-5.4/dba-user-management-core.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 629 bytes
@@ -3050,7 +3050,7 @@
variable of your server:
</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>
@@ -3112,7 +3112,7 @@
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>
Depending on your version of Windows, the preceding instructions
Modified: trunk/refman-6.0/dba-log-files.xml
===================================================================
--- trunk/refman-6.0/dba-log-files.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-6.0/dba-log-files.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 10, Lines Added: 29, Lines Deleted: 31; 5885 bytes
@@ -1342,22 +1342,21 @@
by starting <command>mysqld</command> with the option
<option role="mysqld">--binlog-format=MIXED</option>.
</para>
-
- <para>
- Mixed logging is the default logging mode in MySQL 6.0.
- </para>
-
- <para>
- The logging format can also be set or limited by the storage
- engine being used. This helps to eliminate issues when
- logging, and more specifically replicating, certain
- statements between a master and slave which are using
- different storage engines.
- </para>
</listitem>
</itemizedlist>
+ <para>
+ Mixed logging is the default logging mode in MySQL 6.0.
+ </para>
+
+ <para>
+ The logging format can also be set or limited by the storage
+ engine being used. This helps to eliminate issues when logging,
+ and more specifically replicating, certain statements between a
+ master and slave which are using different storage engines.
+ </para>
+
</section>
<section id="binary-log-setting">
@@ -1499,21 +1498,21 @@
<listitem>
<para>
- From within a stored function or a trigger.
+ From within a stored function or a trigger
</para>
</listitem>
<listitem>
<para>
If the <literal role="se">NDBCLUSTER</literal> storage
- engine is enabled.
+ engine is enabled
</para>
</listitem>
<listitem>
<para>
If the session is currently in row-based replication mode
- and has open temporary tables.
+ and has open temporary tables
</para>
</listitem>
@@ -1583,7 +1582,7 @@
<listitem>
<para>
When a DML statement updates an
- <literal role="se">NDBCLUSTER</literal> table
+ <literal role="se">NDBCLUSTER</literal> table.
</para>
</listitem>
-->
@@ -1591,21 +1590,21 @@
<listitem>
<para>
When a function contains
- <literal role="func">UUID()</literal>
+ <literal role="func">UUID()</literal>.
</para>
</listitem>
<listitem>
<para>
When 2 or more tables with <literal>AUTO_INCREMENT</literal>
- columns are updated
+ columns are updated.
</para>
</listitem>
<listitem>
<para>
When any <literal role="stmt">INSERT DELAYED</literal> is
- executed
+ executed.
</para>
</listitem>
@@ -1614,13 +1613,13 @@
When the body of a view requires row-based replication, the
statement creating the view also uses it — for
example, this occurs when the statement creating a view uses
- the <literal role="func">UUID()</literal> function
+ the <literal role="func">UUID()</literal> function.
</para>
</listitem>
<listitem>
<para>
- When a call to a UDF is involved
+ When a call to a UDF is involved.
</para>
</listitem>
@@ -1630,12 +1629,12 @@
the statement has any temporary tables, then logging by row
is used for all subsequent statements (except for those
accessing temporary tables) until all temporary tables in
- use by that client are dropped
+ use by that client are dropped.
</para>
<para>
This is true whether or not any temporary tables are
- actually logged
+ actually logged.
</para>
<para>
@@ -1644,7 +1643,7 @@
statements using that table are unsafe, and we approximate
this condition by treating all statements made by that
client as unsafe until the client no longer holds any
- temporary tables
+ temporary tables.
</para>
</listitem>
@@ -1657,7 +1656,7 @@
<listitem>
<para>
When <literal role="func">FOUND_ROWS()</literal> or
- <literal role="func">ROW_COUNT()</literal> is used
+ <literal role="func">ROW_COUNT()</literal> is used.
(Bug #12092, Bug #30244)
</para>
</listitem>
@@ -1666,7 +1665,7 @@
<para>
When <literal role="func">USER()</literal>,
<literal role="func">CURRENT_USER()</literal>, or
- <literal role="func">CURRENT_USER</literal> is used
+ <literal role="func">CURRENT_USER</literal> is used.
(Bug #28086)
</para>
</listitem>
@@ -1791,16 +1790,15 @@
<listitem>
<para>
- If an engine supports row-based logging, then the engine is
- said to be <firstterm>row-logging capable</firstterm>.
+ If an engine supports row-based logging, the engine is said
+ to be <firstterm>row-logging capable</firstterm>.
</para>
</listitem>
<listitem>
<para>
- If an engine supports statement-based logging, then the
- engine is said to be <firstterm>statement-logging
- capable</firstterm>.
+ If an engine supports statement-based logging, the engine is
+ said to be <firstterm>statement-logging capable</firstterm>.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-user-management-core.xml
===================================================================
--- trunk/refman-6.0/dba-user-management-core.xml 2009-07-01 23:15:29 UTC (rev 15552)
+++ trunk/refman-6.0/dba-user-management-core.xml 2009-07-01 23:27:28 UTC (rev 15553)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 629 bytes
@@ -3044,7 +3044,7 @@
variable of your server:
</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>
@@ -3106,7 +3106,7 @@
</programlisting>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>
Depending on your version of Windows, the preceding instructions
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r15553 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0 | paul.dubois | 2 Jul |
