Author: jstephens
Date: 2008-08-11 14:09:34 +0200 (Mon, 11 Aug 2008)
New Revision: 11517
Log:
Sorted out evolution of --binlog-format server option
- Fixed references to wrong version numbers in text
- Fixed optvars file to reflect actual history of option/values
- Also a couple of semi-related wording fixes
In plain English:
1. Option was introduced in 5.1.5; allowed values were ROW|STATEMENT;
default value was STATEMENT
2. Additional allowed value MIXED introduced in 5.1.8 (STATEMENT
remained default)
3. MIXED became the default value in 5.1.12
(Many thanks to Ramon, Paul, and Lars)
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.1/replication-configuration.xml
trunk/refman-5.1/replication.xml
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-08-11 10:58:41 UTC (rev 11516)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-08-11 12:09:34 UTC (rev 11517)
Changed blocks: 1, Lines Added: 22, Lines Deleted: 0; 749 bytes
@@ -6,6 +6,28 @@
]>
<changelog>
+ <logentry entrytype="feature">
+
+ <tags>
+ <highlight type="replication"/>
+ <highlight type="importantchange"/>
+ </tags>
+
+ <versions>
+ <version ver="5.1.12"/>
+ </versions>
+
+ <message>
+
+ <para>
+ The default value for the <option>--binlog-format</option>
+ server option is now <literal>MIXED</literal>.
+ </para>
+
+ </message>
+
+ </logentry>
+
<logentry entrytype="bug">
<tags>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-08-11 10:58:41 UTC (rev 11516)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-08-11 12:09:34 UTC (rev 11517)
Changed blocks: 1, Lines Added: 18, Lines Deleted: 1; 1076 bytes
@@ -5784,8 +5784,25 @@
<vartype class="system" isdynamic="yes" scope="both" inversion="5.1.8" format="binlog_format"/>
</types>
- <values vartype="enumeration" platform="all">
+ <values vartype="enumeration" platform="all" inversion="5.1.5" outversion="5.1.7">
+ <value default="STATEMENT"/>
+ <choice value="ROW"/>
+ <choice value="STATEMENT"/>
+
+ </values>
+
+ <values vartype="enumeration" platform="all" inversion="5.1.8" outversion="5.1.11">
+
+ <value default="STATEMENT"/>
+ <choice value="ROW"/>
+ <choice value="STATEMENT"/>
+ <choice value="MIXED"/>
+
+ </values>
+
+ <values vartype="enumeration" platform="all" inversion="5.1.12">
+
<value default="MIXED"/>
<choice value="ROW"/>
<choice value="STATEMENT"/>
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2008-08-11 10:58:41 UTC (rev 11516)
+++ trunk/refman-5.1/replication-configuration.xml 2008-08-11 12:09:34 UTC (rev 11517)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1172 bytes
@@ -1343,8 +1343,8 @@
mixed-format logging. When the mixed format is in effect,
statement-based logging is used by default, but automatically
switches to row-based logging in particular cases as described
- below. This is sometimes referred to as associated
- <firstterm>mixed-based replication</firstterm> (abbreviated as
+ below. This is sometimes referred to as <firstterm>mixed-based
+ replication</firstterm> (abbreviated as
<firstterm>MBR</firstterm>). For more information, see
<xref linkend="binary-log-mixed"/>.
</para>
@@ -1353,8 +1353,8 @@
</itemizedlist>
<para>
- Starting with MySQL 5.1.12, the mixed format is the for MySQL
- replication.
+ Starting with MySQL 5.1.12, the mixed format is the default for
+ MySQL replication.
</para>
<para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2008-08-11 10:58:41 UTC (rev 11516)
+++ trunk/refman-5.1/replication.xml 2008-08-11 12:09:34 UTC (rev 11517)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 726 bytes
@@ -105,7 +105,7 @@
Replication (SBR), which replicates entire SQL statements, and Row
Based Replication (RBR), which replicates only the changed rows. You
may also use a third variety, Mixed Based Replication (MBR), which
- is the default mode within MySQL 5.1.14 and later. For more
+ is the default mode within MySQL 5.1.12 and later. For more
information on the different replication formats, see
<xref linkend="replication-formats"/>.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11517 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-5.1 | jon | 11 Aug |
