Author: paul
Date: 2010-04-23 18:48:05 +0200 (Fri, 23 Apr 2010)
New Revision: 20221
Log:
r58201@frost: paul | 2010-04-23 11:44:31 -0500
5.5.3/6.0.14: New default_storage_engine system variable to be used
in preference to now-deprecated storage_engine
(WL#4738)
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.5/dba-mysqld-server-core.xml
trunk/refman-6.0/dba-mysqld-server-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:38445
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:58179
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:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:38445
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:58201
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:39546
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2010-04-23 15:15:09 UTC (rev 20220)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2010-04-23 16:48:05 UTC (rev 20221)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 3; 1144 bytes
@@ -8712,17 +8712,19 @@
<types>
<optype class="cmdline" format="--default-storage-engine=name"/>
<optype class="mycnf"/>
+ <vartype class="system" isdynamic="yes" scope="both" inversion="5.5.3"/>
</types>
+ <values vartype="string" platform="all" inversion="5.5.3"/>
+
<versions>
<manual version="4.1"/>
<introduced version="4.1.2"/>
<manual version="5.0"/>
<manual version="5.1"/>
<manual version="5.4"/>
-<!-- not in 5.5 -->
+ <manual version="5.5"/>
<manual version="6.0"/>
- <removed version="6.0.8"/>
</versions>
</mysqloption>
@@ -8751,7 +8753,7 @@
<manual version="5.0"/>
<manual version="5.1"/>
<manual version="5.4"/>
- <manual version="5.5"/>
+<!-- not in 5.5 -->
<manual version="6.0"/>
<removed version="6.0.8"/>
</versions>
Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml 2010-04-23 15:15:09 UTC (rev 20220)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml 2010-04-23 16:48:05 UTC (rev 20221)
Changed blocks: 2, Lines Added: 35, Lines Deleted: 0; 1826 bytes
@@ -4592,6 +4592,36 @@
</listitem>
<listitem>
+ <para id="sysvar_default_storage_engine">
+ <indexterm>
+ <primary>default_storage_engine system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>default_storage_engine</secondary>
+ </indexterm>
+
+ <literal role="sysvar">default_storage_engine</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.5:mysqld:default-storage-engine"/>
+
+ <para>
+ The default storage engine. To set the storage engine at
+ server startup, use the
+ <option role="mysqld">--default-storage-engine</option>
+ option. See <xref linkend="server-options"/>.
+ </para>
+
+ <para>
+ This variable was added in MySQL 5.5.3 to be used in
+ preference to <literal role="sysvar">storage_engine</literal>,
+ which is now deprecated.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="sysvar_default_week_format">
<indexterm>
<primary>default_week_format system variable</primary>
@@ -9342,6 +9372,11 @@
<option role="mysqld">--default-storage-engine</option>
option. See <xref linkend="server-options"/>.
</para>
+
+ <para>
+ This variable is deprecated as of MySQL 5.5.3 in favor of
+ <literal role="sysvar">default_storage_engine</literal>.
+ </para>
</listitem>
<listitem>
Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml 2010-04-23 15:15:09 UTC (rev 20220)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml 2010-04-23 16:48:05 UTC (rev 20221)
Changed blocks: 2, Lines Added: 35, Lines Deleted: 0; 1829 bytes
@@ -4852,6 +4852,36 @@
</listitem>
<listitem>
+ <para id="sysvar_default_storage_engine">
+ <indexterm>
+ <primary>default_storage_engine system variable</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>system variable</primary>
+ <secondary>default_storage_engine</secondary>
+ </indexterm>
+
+ <literal role="sysvar">default_storage_engine</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="5.5:mysqld:default-storage-engine"/>
+
+ <para>
+ The default storage engine. To set the storage engine at
+ server startup, use the
+ <option role="mysqld">--default-storage-engine</option>
+ option. See <xref linkend="server-options"/>.
+ </para>
+
+ <para>
+ This variable was added in MySQL 6.0.14 to be used in
+ preference to <literal role="sysvar">storage_engine</literal>,
+ which is now deprecated.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="sysvar_default_week_format">
<indexterm>
<primary>default_week_format system variable</primary>
@@ -9983,6 +10013,11 @@
<option role="mysqld">--default-storage-engine</option>
option. See <xref linkend="server-options"/>.
</para>
+
+ <para>
+ This variable is deprecated as of MySQL 6.0.14 in favor of
+ <literal role="sysvar">default_storage_engine</literal>.
+ </para>
</listitem>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r20221 - in trunk: . dynamic-docs/command-optvars refman-5.5 refman-6.0 | paul.dubois | 23 Apr |
