Author: paul
Date: 2009-05-04 18:54:19 +0200 (Mon, 04 May 2009)
New Revision: 14798
Log:
r40868@frost: paul | 2009-05-04 11:33:21 -0500
Fix some version roles
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.0/dba-mysqld-server-core.xml
trunk/refman-5.1/dba-mysqld-server-core.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/storage-engines-core.xml
trunk/refman-5.4/Notes
trunk/refman-5.4/dba-mysqld-server-core.xml
trunk/refman-5.4/replication-options-core.xml
trunk/refman-5.4/storage-engines-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:40866
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:40868
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 2, Lines Added: 22, Lines Deleted: 15; 2534 bytes
@@ -14845,20 +14845,27 @@
<vartype isdynamic="yes" class="system" scope="both"/>
</types>
- <values vartype="enumeration" platform="all" outversion="5.2.4">
- <choice value="index_merge"/>
- <choice value="index_merge_intersection"/>
- <choice value="index_merge_union"/>
- <choice value="index_merge_sort_union"/>
+ <values vartype="set" platform="all" outversion="5.2.3">
+ <choice value="index_merge={on|off}"/>
+ <choice value="index_merge_intersection={on|off}"/>
+ <choice value="index_merge_union={on|off}"/>
+ <choice value="index_merge_sort_union={on|off}"/>
</values>
- <values vartype="enumeration" platform="all" inversion="5.2.4">
+ <values vartype="set" platform="all" inversion="5.2.4">
<value default="''"/>
<choice value="no_semijoin"/>
<choice value="no_materialization"/>
</values>
- <values vartype="enumeration" platform="all" outversion="6.0.11">
+ <values vartype="set" platform="all" inversion="5.4.0">
+ <choice value="index_merge={on|off}"/>
+ <choice value="index_merge_intersection={on|off}"/>
+ <choice value="index_merge_union={on|off}"/>
+ <choice value="index_merge_sort_union={on|off}"/>
+ </values>
+
+ <values vartype="set" platform="all" outversion="6.0.10">
<value default="''"/>
<choice value="no_semijoin"/>
<choice value="no_materialization"/>
@@ -14866,14 +14873,14 @@
<choice value="no_firstmatch"/>
</values>
- <values vartype="enumeration" platform="all" inversion="6.0.11">
- <choice value="index_merge"/>
- <choice value="index_merge_intersection"/>
- <choice value="index_merge_union"/>
- <choice value="semijoin"/>
- <choice value="materialization"/>
- <choice value="loosescan"/>
- <choice value="firstmatch"/>
+ <values vartype="set" platform="all" inversion="6.0.11">
+ <choice value="index_merge={on|off}"/>
+ <choice value="index_merge_intersection={on|off}"/>
+ <choice value="index_merge_union={on|off}"/>
+ <choice value="semijoin={on|off}"/>
+ <choice value="materialization={on|off}"/>
+ <choice value="loosescan={on|off}"/>
+ <choice value="firstmatch={on|off}"/>
</values>
<versions>
Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 614 bytes
@@ -7614,7 +7614,7 @@
<literal role="sysvar">server_id</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
+ <para condition="dynamic:optvar:item" role="5.0:mysqld:server-id"/>
<para>
The server ID, used in replication to give each master and
Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 965 bytes
@@ -7300,7 +7300,7 @@
<literal role="sysvar">optimizer_switch</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:optimizer_switch"/>
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:optimizer_switch"/>
<para>
The <literal role="sysvar">optimizer_switch</literal> system
@@ -8105,7 +8105,7 @@
<literal role="sysvar">server_id</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:server-id"/>
<para>
The server ID, used in replication to give each master and
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.1/replication-options-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 643 bytes
@@ -2257,7 +2257,7 @@
<literal>sql_slave_skip_counter</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:sql_slave_skip_counter"/>
+ <para condition="dynamic:optvar:item" role="5.1:mysqld:sql_slave_skip_counter"/>
<para>
The number of events from the master that a slave server
Modified: trunk/refman-5.1/storage-engines-core.xml
===================================================================
--- trunk/refman-5.1/storage-engines-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.1/storage-engines-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 592 bytes
@@ -288,7 +288,7 @@
provided with MySQL:
</para>
- <para condition="dynamic:storageengines:fullsummary" role="6.0:myisam,memory,innodb,archive,ndb"/>
+ <para condition="dynamic:storageengines:fullsummary" role="5.1:myisam,memory,innodb,archive,ndb"/>
<section id="storage-engine-compare-transactions">
Modified: trunk/refman-5.4/Notes
===================================================================
--- trunk/refman-5.4/Notes 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.4/Notes 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 433 bytes
@@ -23,3 +23,5 @@
* Drop all references to innodb_file_io_threads
* Need 5.4 reserved words
* Remove Instance Manager [DONE]
+* Remove optimizer_switch stuff (it's from 5.1.34, which isn't merged into 5.4
+ yet)
Modified: trunk/refman-5.4/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.4/dba-mysqld-server-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.4/dba-mysqld-server-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 965 bytes
@@ -7275,7 +7275,7 @@
<literal role="sysvar">optimizer_switch</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:optimizer_switch"/>
+ <para condition="dynamic:optvar:item" role="5.4:mysqld:optimizer_switch"/>
<para>
The <literal role="sysvar">optimizer_switch</literal> system
@@ -8080,7 +8080,7 @@
<literal role="sysvar">server_id</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
+ <para condition="dynamic:optvar:item" role="5.4:mysqld:server-id"/>
<para>
The server ID, used in replication to give each master and
Modified: trunk/refman-5.4/replication-options-core.xml
===================================================================
--- trunk/refman-5.4/replication-options-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.4/replication-options-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 643 bytes
@@ -2257,7 +2257,7 @@
<literal>sql_slave_skip_counter</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:sql_slave_skip_counter"/>
+ <para condition="dynamic:optvar:item" role="5.4:mysqld:sql_slave_skip_counter"/>
<para>
The number of events from the master that a slave server
Modified: trunk/refman-5.4/storage-engines-core.xml
===================================================================
--- trunk/refman-5.4/storage-engines-core.xml 2009-05-04 16:11:37 UTC (rev 14797)
+++ trunk/refman-5.4/storage-engines-core.xml 2009-05-04 16:54:19 UTC (rev 14798)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 592 bytes
@@ -288,7 +288,7 @@
provided with MySQL:
</para>
- <para condition="dynamic:storageengines:fullsummary" role="6.0:myisam,memory,innodb,archive,ndb"/>
+ <para condition="dynamic:storageengines:fullsummary" role="5.4:myisam,memory,innodb,archive,ndb"/>
<section id="storage-engine-compare-transactions">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r14798 - in trunk: . dynamic-docs/command-optvars refman-5.0 refman-5.1 refman-5.4 | paul.dubois | 4 May |
